From 99910a294d73f80753af63d3a5215f2f50060426 Mon Sep 17 00:00:00 2001
From: Gea-Suan Lin <darkkiller@gmail.com>
Date: Sat, 19 Mar 2011 22:54:18 +0800
Subject: [PATCH] Use vimdiff as mergetool.

---
 .gitconfig | 2 ++
 1 file changed, 2 insertions(+)

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