From: Simon Ruderich <simon@ruderich.org>
Date: Fri, 15 May 2009 08:35:57 +0000 (+0200)
Subject: git: Use vimdiff as mergetool on Debian.
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=820d6054f0f9a0100aec5ee2e9e9813a58be53a4;p=config%2Fdotfiles.git

git: Use vimdiff as mergetool on Debian.
---

diff --git a/gitconfig.m4 b/gitconfig.m4
index cc29fcb..9ef54b0 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -31,5 +31,8 @@ include(../lib.m4)
 IF(OS, darwin)
 	tool = opendiff
 FI
+IF(OS, debian)
+	tool = vimdiff
+FI
 
 # vim: ft=gitconfig