nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00
Code Activity
home-manager/tests/modules/programs/mergiraf
History
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
..
basic-configuration.nix treewide: remove unused code (#6985) 2025-05-07 10:03:21 -05: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: add merge.conflictStyle git configuration 2025-10-14 22:59:58 -05:00