diff --git a/git/.gitconfig b/git/.gitconfig
index dfd17da..dbf627d 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -23,7 +23,7 @@
   program = gpg
 
 [merge]
-  tool = vimdiff
+  tool = nvim -d
 
 [pull]
   rebase = false