From 880127549cb9fa844175ad348c46fa7e71e5d290 Mon Sep 17 00:00:00 2001
From: Artem Sapegin <artem@sapegin.ru>
Date: Sun, 24 Feb 2013 23:24:42 +0400
Subject: [PATCH] Git: DiffMerge.

---
 tilde/gitconfig | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tilde/gitconfig b/tilde/gitconfig
index 7699dd1..c1f96d8 100644
--- a/tilde/gitconfig
+++ b/tilde/gitconfig
@@ -44,6 +44,17 @@
 [url "git://gist.github.com/"]
 	insteadOf = "gist:"
 
+# DiffMerge
+[merge]
+	tool = diffmerge
+[mergetool "diffmerge"]
+	cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
+	trustExitCode = true
+[diff]
+	tool = diffmerge
+[difftool "diffmerge"]
+	cmd = diffmerge $LOCAL $REMOTE
+
 # Include local settings
 # Requires Git 1.7.10
 # git config -f ~/.gitlocal user.email "artem@sapegin.ru"