From 24d82f05b3040d98099163eb12c261466e81169b Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Wed, 20 Jan 2010 16:17:53 +1300
Subject: [PATCH 1/1] add diff.tool

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

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]
-- 
2.39.2