1 files changed, 3 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index f56aac4..134da2d 100644
--- a/gitconfig
+++ b/gitconfig
@@ -32,6 +32,9 @@
 [color]
   ui = true
 
+[merge]
+  tool = vimdiff
+
 [url "git://github.com/mssola/"]
   insteadOf = mssola:
 [url "git@github.com:mssola/"]