diff --git a/.gitconfig b/.gitconfig
index edad754..fa958c8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -9,6 +9,8 @@
     ui = auto
 [core]
     preloadindex = yes
+[merge]
+    tool = vimdiff
 [user]
     email = darkkiller@gmail.com
     name = Gea-Suan Lin