diff --git a/.gitconfig_includes.common b/.gitconfig_includes.common
index 295ec988..96ef78da 100644
--- a/.gitconfig_includes.common
+++ b/.gitconfig_includes.common
@@ -16,7 +16,7 @@
 
 
 [diff]
-    tool = kdiff3
+    tool = vimdiff
 [difftool]
     prompt = false
 [merge]