about summary refs log tree commit diff
path: root/home/profiles
diff options
context:
space:
mode:
Diffstat (limited to 'home/profiles')
-rw-r--r--home/profiles/development/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix
index 15cec65..71cf3af 100644
--- a/home/profiles/development/default.nix
+++ b/home/profiles/development/default.nix
@@ -41,7 +41,7 @@ in
         init.defaultBranch = "main";
         pull.rebase = true;
 
-        merge.conflictStyle = "diff3";
+        merge.conflictStyle = "zdiff3";
 
         mergetool.fugitive = {
           cmd = ''nvim -f -c "Gvdiffsplit!" "$MERGED"'';