diff --git a/git/.gitconfig b/git/.gitconfig
index 7d0e326..7c6e58d 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -18,7 +18,7 @@
 [diff]
 	colorMoved = default
 [merge]
-	tool = vimdiff3
+	tool = vimdiff
 	conflictstyle = diff3
 	ff = only
 [mergetool]