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
awwpotato
5da6eafceb
treewide: remove unused code ( #6985 )
2025-05-07 10:03:21 -05:00
Austin Horstman
cba2f9ce95
treewide: reformat nixfmt-rfc-style
...
Reformat repository using new nixfmt-rfc-style.
2025-04-08 08:50:05 -07: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
