Set conflict style to diff3

2021-12-30 05:14:20 +01:00 · 2021-12-30 05:14:20 +01:00 · 9d9c94c5ed
parent b28f3ffd9c
commit 9d9c94c5ed
1 changed files with 1 additions and 0 deletions
--- a/home-manager/roles/default.nix
+++ b/home-manager/roles/default.nix
@ -67,6 +67,7 @@
      };

      extraConfig = {
+        merge.conflictStyle = "diff3";
        pull.ff = "only";
        core.editor = "vim";
        init.defaultBranch = "main";