nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
2.home-manager/tests/modules/programs/mergiraf/mergiraf-git-attributes.conf
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

1 line
17 B
Text
Raw Blame History

* merge=mergiraf
Reference in a new issue View git blame Copy permalink