git: use zdiff3

2023-11-07 12:36:04 +01:00 · 2023-11-07 12:36:04 +01:00 · 5ff0781b10
parent 3e4d7c198c
commit 5ff0781b10
1 changed files with 4 additions and 0 deletions
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@ -40,6 +40,10 @@
        whitespace = "fix";
      };

+      merge = {
+        conflictStyle = "zdiff3";
+      };
+
      rerere = {
        enabled = true;
      };