diff --git a/gitconfig b/gitconfig
index 21f884f..d23d3d5 100644
--- a/gitconfig
+++ b/gitconfig
@@ -74,6 +74,8 @@
 [mergetool "Kaleidoscope"]
   cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
   trustexitcode = true
+[mergetool "nvim"]
+  cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [mergetool "code"]
   cmd = "code $MERGED"
   keepBackup = false