From 3df8bfe42788cfdf6cfde6e1126409fd168e3fce Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <thomasr@brandwatch.com>
Date: Wed, 16 Jul 2014 11:51:18 +0200
Subject: [PATCH] remove bc3 as git's mergetool

---
 gitconfig | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gitconfig b/gitconfig
index 36c0e23..6bac153 100644
--- a/gitconfig
+++ b/gitconfig
@@ -17,10 +17,6 @@
     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
 [push]
 	default = current
 [giggle]