Made neovim work as vimdiff

Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com>
2019-10-27 22:43:52 +02:00 · 2019-10-27 22:43:52 +02:00 · b88a199b35
parent 6979312ca1
commit b88a199b35
1 changed files with 7 additions and 0 deletions
--- a/home/.gitconfig
+++ b/home/.gitconfig
@ -5,3 +5,10 @@
 [commit]
 	signoff = true
 	gpgsign = true
+[diff]
+    tool = vimdiff
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3
+[mergetool "vimdiff"]
+    cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'