From: martin f. krafft <madduck@madduck.net>
Date: Wed, 20 Jan 2010 03:17:53 +0000 (+1300)
Subject: add diff.tool
X-Git-Url: https://git.madduck.net/etc/git.git/commitdiff_plain/24d82f05b3040d98099163eb12c261466e81169b

add diff.tool
---

diff --git a/.gitconfig b/.gitconfig
index 5d853a2..3cb2e85 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -22,6 +22,8 @@
 	autosetuprebase = remote
 [merge]
 	tool = vimdiff
+[diff]
+	tool = vimdiff
 [gui]
 	fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
 [color]