(n)vimdiff

11 months ago · 7161260248
parent 32536954df
commit 7161260248
1 changed files with 4 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -47,6 +47,10 @@
 	conflictstyle = diff3
 	ff = false
 	tool = vimdiff
+[mergetool "vimdiff"]
+	path = nvim
+[mergetool "nvimdiff"]
+	cmd = nvim -d \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
 [mergetool "sourcetree"]
 	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true