diff --git a/gitconfig b/gitconfig
index 22f561a..5a79b55 100644
--- a/gitconfig
+++ b/gitconfig
@@ -9,7 +9,7 @@
   tool = vimdiff
   trustExitCode = true
 [difftool]
-  prompt = false
+  prompt = true
 [alias]
   d = difftool
   co = checkout
@@ -20,6 +20,8 @@
   br = branch
 [mergetool]
 	keepBackup = false
+[mergetool "vimdiff"]
+  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 [core]
   editor = vim