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
..
basic-configuration.nix	mergiraf: init module (#6633)	2025-03-25 21:37:24 +01:00
default.nix	mergiraf: init module (#6633)	2025-03-25 21:37:24 +01:00
mergiraf-git-attributes.conf	mergiraf: init module (#6633)	2025-03-25 21:37:24 +01:00
mergiraf-git.conf	mergiraf: init module (#6633)	2025-03-25 21:37:24 +01:00