diff --git a/.gitconfig b/.gitconfig
index aaefbaa..7d88044 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -22,3 +22,5 @@
 	signingkey = A8F721C80E43073F40DF8F21B57DBE40C72FBCF4
 [commit]
 	gpgsign = true
+[merge]
+	tool = vimdiff1