nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Set diff conflictStyle to zdiff3

Browse source 
https://github.blog/open-source/git/highlights-from-git-2-35/
https://git-scm.com/docs/git-config#Documentation/git-config.txt-mergeconflictStyle
This commit is contained in:
Natsu Kagami 2025-01-04 15:48:03 +01:00
parent 65410deb2f
commit 73764de6f4
Signed by: nki
GPG key ID: 55A032EB38B49ADB
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home/common.nix
View file

@ -106,7 +106,7 @@
.kakrc .kakrc
''}"; ''}";
safe.directory = "*"; safe.directory = "*";
merge.conflictstyle = "diff3"; merge.conflictstyle = "zdiff3";
}; };
}; };