diff --git a/gitconfig b/gitconfig
index 8b47271..07786c2 100644
--- a/gitconfig
+++ b/gitconfig
@@ -23,6 +23,7 @@
 [merge]
 	conflictstyle = diff3
 	renormalize = true
+	tool = vimdiff3
 [pack]
 	threads = 0
 [pull]