1 files changed, 2 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 084228d..b6deec6 100644
--- a/gitconfig
+++ b/gitconfig
@@ -22,6 +22,8 @@
 	gpgSign = true
 [merge]
 	tool = vimdiff
+[mergetool "vimdiff"]
+  cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 [alias]
 	co = checkout
 	ci = commit