use zdiff3 instead of regular diff3

2023-01-20 10:23:30 +01:00 · 2023-01-20 10:23:30 +01:00 · 614fdf523e
parent 01cb099643
commit 614fdf523e
1 changed files with 1 additions and 1 deletions
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@ -48,7 +48,7 @@ in
        userEmail = cfg.identity.email;
        extraConfig = {
          init.defaultBranch = "main";
-          merge.conflictstyle = "diff3";
+          merge.conflictstyle = "zdiff3";
        };
        delta.enable = true;
        signing = mkIf cfg.signing {