Set diff conflictStyle to zdiff3

https://github.blog/open-source/git/highlights-from-git-2-35/ https://git-scm.com/docs/git-config#Documentation/git-config.txt-mergeconflictStyle
2025-01-04 15:48:03 +01:00 · 2025-01-04 15:48:03 +01:00 · 5ff48d63c6
parent cb800c9fa4
commit 5ff48d63c6
1 changed files with 1 additions and 1 deletions
--- a/home/common.nix
+++ b/home/common.nix
@ -106,7 +106,7 @@
          .kakrc
        ''}";
        safe.directory = "*";
-        merge.conflictstyle = "diff3";
+        merge.conflictstyle = "zdiff3";
      };
    };