From 164b69dc0c313e4a4dfcbe5ff6cc02fdc3481eb7 Mon Sep 17 00:00:00 2001
From: Mathieu Maret <mathieu.maret@gmail.com>
Date: Tue, 30 Jun 2015 15:48:10 +0200
Subject: [PATCH] [git]use meld for gittool gitmerge

---
 .gitconfig | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 448c4e1..77775e8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,11 +20,22 @@
     lol = log --graph --decorate --pretty=oneline --abbrev-commit
     lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
     ls = ls-files
-[diff "odf"]
-# add to .git/info/attributes
-# *.ods diff=odf
-# *.odt diff=odf
-# *.odp diff=odf
-    textconv=odt2txt
-[diff "odt"]
-    textconv=odt2txt
+	dt=difftool # to have diff with meld
+#[diff "odf"]
+#    textconv=odt2txt
+#[diff "odt"]
+#    textconv=odt2txt
+[difftool "meld"]
+    path = /usr/bin/meld
+    trustExitCode = false
+[difftool]
+    prompt = false
+[diff]
+    tool = meld
+[mergetool "meld"]
+    path = /usr/bin/meld
+    trustExitCode = false
+[mergetool]
+    keepBackup = false
+[merge]
+    tool = meld