remove bc3 as git's mergetool

2026-03-03 06:27:21 +01:00 · 2014-07-16 11:51:18 +02:00
parent 529d9878f8
commit 3df8bfe427
1 changed files with 0 additions and 4 deletions
--- a/4
+++ b/4
@@ -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]