1 files changed, 3 insertions, 0 deletions

diff --git a/gitconfig b/gitconfig
index c9799e7..2b011fc 100644
--- a/gitconfig
+++ b/gitconfig
@@ -13,5 +13,8 @@
 [core]
         pager = 
 
+[merge]
+    tool = vimdiff
+
 [color]
         ui = off