From 142604f1523e0cb36bc2e00966c2483c0b1d52b4 Mon Sep 17 00:00:00 2001
From: Guillaume DOTT <guillaume.dott@lafourmi-immo.com>
Date: Thu, 8 Nov 2012 15:08:01 +0100
Subject: [PATCH] git: set vimdiff as difftool and mergetool

---
 git/gitconfig.include | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/git/gitconfig.include b/git/gitconfig.include
index 2b7386b..55dc639 100644
--- a/git/gitconfig.include
+++ b/git/gitconfig.include
@@ -5,4 +5,8 @@
 	st = status
 	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
 	ll = log --stat --abbrev-commit
+[diff]
+	tool = vimdiff
+[merge]
+	tool = vimdiff
 # vim: set filetype=gitconfig: