diff --git a/symlinks/gitconfig b/symlinks/gitconfig
index c760b82..d5d14ed 100644
--- a/symlinks/gitconfig
+++ b/symlinks/gitconfig
@@ -9,11 +9,11 @@
 [web]
 	browser = xdg-open
 [diff]
-	tool = vimdiff
+	tool = nvimdiff
 [difftool]
-	prompt = false
+	prompt = true
 [merge]
-	tool = vimdiff
+	tool = nvimdiff
 [mergetool]
 	keepBackup = false
 [guitool "Add to .gitignore"]