use zdiff3 instead of regular diff3
This commit is contained in:
parent
01cb099643
commit
614fdf523e
1 changed files with 1 additions and 1 deletions
|
@ -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 {
|
||||||
|
|
Loading…
Reference in a new issue