From cdb7778375e31f4b3063ce631b785b660c2c476b Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Tue, 9 Oct 2012 11:56:58 +0200
Subject: [PATCH] add beyond compare as mergetool

---
 gitconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gitconfig b/gitconfig
index ffc08cd..c0165b1 100644
--- a/gitconfig
+++ b/gitconfig
@@ -17,3 +17,7 @@
     changes = diff --name-status -r
     diffstat = diff --stat -r
     lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
+[merge]
+    tool = bc3
+[mergetool]
+    cmd = /usr/bin/bcompare $LOCAL $REMOTE $BASE $MERGED