Set git to use fancy conflict style with 3-way diffs

2023-11-22 15:02:05 +01:00 · 2023-11-22 15:02:05 +01:00 · f0a983c52d
parent 58034eb5b0
commit f0a983c52d
1 changed files with 1 additions and 0 deletions
--- a/home/common.nix
+++ b/home/common.nix
@ -150,6 +150,7 @@ in
          .envrc
          .kakrc
        ''}";
+        merge.conflictstyle = "diff3";
      };
    };