diff --git a/gitconfig b/gitconfig
index 8060699..a177522 100644
--- a/gitconfig
+++ b/gitconfig
@@ -11,13 +11,13 @@ rebase = true
 
 [merge]
 ff = only
-tool = vimdiff2
+tool = vimdiff
 
 [mergetool]
 keepBackup = false
 
 [diff]
-tool = vimdiff2
+tool = vimdiff
 
 [difftool]
 prompt=true