diff --git a/gitconfig b/gitconfig
index 5a79b55..d35cf16 100644
--- a/gitconfig
+++ b/gitconfig
@@ -23,6 +23,6 @@
 [mergetool "vimdiff"]
   cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 [core]
-  editor = vim
+  editor = nvim
 
 # vim: ft=gitconfig