Fixed vimdiff

Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com>
5 years ago · 46a7f1ee52
parent 092a1b0e96
commit 46a7f1ee52
1 changed files with 8 additions and 5 deletions
--- a/home/.gitconfig
+++ b/home/.gitconfig
@ -5,10 +5,13 @@
 [commit]
 	signoff = true
 	gpgsign = true
-[diff]
-    tool = vimdiff
 [merge]
-    tool = vimdiff
-    conflictstyle = diff3
+  tool = vimdiff
+[mergetool]
+  prompt = true
 [mergetool "vimdiff"]
-    cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+[difftool]
+  prompt = false
+[diff]
+  tool = vimdiff