nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
5817 commits 3 branches 0 tags 19 MiB
Commit graph

2 commits

Author SHA1 Message Date
Bob van der Linden
ba6aaa0e0a mergiraf: add merge.conflictStyle git configuration 
Mergiraf expects merge.conflictStyle to be "diff3" in git. If this isn't
the case, mergiraf cannot operate correctly. This change adds this
option to git's configuration.
 2025-10-14 22:59:58 -05: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