add beyond compare as mergetool

2026-03-03 14:37:25 +01:00 · 2012-10-09 11:56:58 +02:00
parent 8ceaf9478a
commit cdb7778375
1 changed files with 4 additions and 0 deletions
--- a/4
+++ b/4
@@ -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