From 1b7beb872c7b9b2652250626b1fcc0c3aa3cd461 Mon Sep 17 00:00:00 2001
From: Guillaume DOTT <guillaume.dott@lafourmi-immo.com>
Date: Thu, 21 Feb 2013 17:17:09 +0100
Subject: [PATCH] git: use meld as mergetool

---
 git/gitconfig.include | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git/gitconfig.include b/git/gitconfig.include
index b558aa3..128ac2a 100644
--- a/git/gitconfig.include
+++ b/git/gitconfig.include
@@ -7,11 +7,12 @@
 	co = checkout
 	pr = pull --rebase
 	dc = diff --cached
+	r = remote
 	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
 	ll = log --stat --abbrev-commit
 	amend = commit --amend -C HEAD
 [diff]
 	tool = vimdiff
 [merge]
-	tool = vimdiff
+	tool = meld
 # vim: set filetype=gitconfig: