From 820d6054f0f9a0100aec5ee2e9e9813a58be53a4 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Fri, 15 May 2009 10:35:57 +0200
Subject: [PATCH] git: Use vimdiff as mergetool on Debian.

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

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
-- 
2.44.2