Use zdiff3 in git

2024-01-30 23:17:16 +01:00 · 2024-01-30 23:17:16 +01:00 · c0f6d1ea7e
parent 264896aba7
commit c0f6d1ea7e
1 changed files with 1 additions and 0 deletions
--- a/common/home_manager/common.nix
+++ b/common/home_manager/common.nix
@ -38,6 +38,7 @@
        extraConfig = {
          init = { defaultBranch = "mistress"; };
          core = { editor = "hx"; };
+          merge.conflictStyle = "zdiff3";
          rebase.autosquash = true;
          pull.rebase = true;
        };