moritz/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use zdiff3 instead of regular diff3

Browse source
This commit is contained in:
Moritz Böhme 2023-01-20 10:23:30 +01:00
parent 01cb099643
commit 614fdf523e
Signed by: moritz
GPG key ID: 970C6E89EB0547A9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/programs/git.nix
View file

@ -48,7 +48,7 @@ in
userEmail = cfg.identity.email; userEmail = cfg.identity.email;
extraConfig = { extraConfig = {
init.defaultBranch = "main"; init.defaultBranch = "main";
merge.conflictstyle = "diff3"; merge.conflictstyle = "zdiff3";
}; };
delta.enable = true; delta.enable = true;
signing = mkIf cfg.signing { signing = mkIf cfg.signing {