3 commits

Author	SHA1	Message	Date
Bruno BELANYI	d7ef0034e3	mergiraf: add 'enable{Git,Jujutsus}Integration'	2026-03-11 21:52:41 -05:00
Vinicius Deolindo	1742b5cb6a	mergiraf: add jujutsu integration	2026-02-01 14:06:20 +01:00
Bob van der Linden	d8b4ba070f	mergiraf: init module (#6633) ... This adds git integration for mergiraf. It sets up git to use mergiraf to automatically resolve merge conflicts.	2025-03-25 21:37:24 +01:00