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

mergiraf: add merge.conflictStyle git configuration

Browse source 
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.
This commit is contained in:
Bob van der Linden 2025-10-14 22:08:24 +02:00 • committed by Austin Horstman
parent ed1eb4cfdd
commit ba6aaa0e0a
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/programs/mergiraf.nix
View file

@ -30,9 +30,12 @@ in
programs.git = { programs.git = {
attributes = [ "* merge=mergiraf" ]; attributes = [ "* merge=mergiraf" ];
extraConfig = { extraConfig = {
merge.mergiraf = { merge = {
name = "mergiraf"; mergiraf = {
driver = "${mergiraf} merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L"; name = "mergiraf";
driver = "${mergiraf} merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L";
};
conflictStyle = "diff3";
}; };
}; };
}; };

3
tests/modules/programs/mergiraf/mergiraf-git.conf
View file

@ -4,6 +4,9 @@
[gpg "openpgp"] [gpg "openpgp"]
program = "@gnupg@/bin/gpg" program = "@gnupg@/bin/gpg"
[merge]
conflictStyle = "diff3"
[merge "mergiraf"] [merge "mergiraf"]
driver = "@mergiraf@/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L" driver = "@mergiraf@/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L"
name = "mergiraf" name = "mergiraf"