diff --git a/.gitconfig b/.gitconfig
index 8302e42..c983603 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -71,7 +71,7 @@
   helper = !/usr/bin/gh auth git-credential
 
 [merge]
-  tool = vimdiff
+  tool = nvimdiff
   conflictstyle = diff3
 [pull]
   rebase = true