Update git nvimdiff config

pmendelski · Nov 5, 2024 · 44fef10 · 44fef10
1 parent e343712
commit 44fef10
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/git/.gitconfig_base b/git/.gitconfig_base
@@ -31,9 +31,9 @@
 
 [merge]
   tool = nvimdiff
-  conflictstyle = diff3
+  conflictstyle = zdiff3
 [mergetool "nvimdiff"]
-  cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd L\"
+  cmd = nvim -d \"$LOCAL\" \"$MERGED\" \"$BASE\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd J\"
 
 [diff]
   tool = nvimdiff