diff --git a/git/.gitconfig b/git/.gitconfig
index 4391554..8612cf6 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,3 +3,5 @@
 [user]
 	name = The Magician
 	email = themagician@engineer.com
+[merge]
+	tool = vimdiff