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

Set git to use fancy conflict style with 3-way diffs

Browse source
This commit is contained in:
Natsu Kagami 2023-11-22 15:02:05 +01:00
parent 58034eb5b0
commit f0a983c52d
Signed by: nki
GPG key ID: 55A032EB38B49ADB
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
home/common.nix
View file

@ -150,6 +150,7 @@ in
.envrc .envrc
.kakrc .kakrc
''}"; ''}";
merge.conflictstyle = "diff3";
}; };
}; };