From 4f55bae930aa3c6caec074ad19df82d7fb0ced4b Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <matthias.kretschmann@ezeep.com>
Date: Thu, 20 Jun 2013 18:26:10 +0200
Subject: [PATCH] diffmerge as merge tool

---
 gitconfig | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gitconfig b/gitconfig
index 5d8dec0..4edf68d 100644
--- a/gitconfig
+++ b/gitconfig
@@ -40,4 +40,19 @@
 	c = commit
 	cm = commit -m
 	l = log --graph --pretty=format:'%C(yellow)%h%C(cyan)%d%Creset %s %C(white)- %an, %ar%Creset'
-	ll = log --stat --abbrev-commit
\ No newline at end of file
+	ll = log --stat --abbrev-commit
+[difftool "sourcetree"]
+    cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+    path =
+[mergetool "sourcetree"]
+    cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+    trustExitCode = true
+[diff]
+    tool = diffmerge
+[difftool "diffmerge"]
+    cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
+[merge]
+    tool = diffmerge
+[mergetool "diffmerge"]
+    cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
+    trustExitCode = true
\ No newline at end of file