home: git: use 'zdiff3' merge conflict markers

See GitHub's presentation about this feature [1]. [1]: https://github.blog/2022-01-24-highlights-from-git-2-35/
2022-03-11 14:10:04 +01:00 · 2022-03-11 14:10:04 +01:00 · b71be091a2
parent 20e0a96e65
commit b71be091a2
1 changed files with 4 additions and 0 deletions
--- a/home/git/default.nix
+++ b/home/git/default.nix
@ -120,6 +120,10 @@ in
        defaultBranch = "main";
      };

+      merge = {
+        conflictStyle = "zdiff3";
+      };
+
      pull = {
        # Avoid useless merge commits
        rebase = true;