Update git diff method

2025-12-16 07:45:41 +00:00 · 2022-03-02 19:14:46 +00:00
parent c9dd6b03ec
commit 005de0c62a
1 changed files with 6 additions and 0 deletions
--- a/home.nix
+++ b/home.nix
@@ -159,6 +159,12 @@ in {
      pull = {
        twohead = "ort";
      };
+      merge = {
+        conflictStyle = "zdiff3";
+      };
+      diff = {
+        colorMoved = "default";
+      };
    };
  };