View Full Version : BC3 as diff/merge tool on Linux instructions updated
03-Jun-2009, 09:15 AM
I posted updated instructions for using BC3 for Linux as a diff and merge tool with Git (http://git-scm.com/) in our knowledgebase article Using Beyond Compare with Version Control Systems (http://www.scootersoftware.com/support.php?zz=kb_vcs.php).
The previous instructions worked correctly for diff, but required a small change to work correctly for merge. Once configured following the instructions at the above link, you can launch a merge in BC3 using the command "git mergetool filename.txt".
The system used to test the instructions was running Ubuntu 9.0.4, Git 220.127.116.11, and BC3 for Linux 3.1.3.
11-Oct-2011, 10:31 AM
This should be updated again as modern msysgit now support BC3 built-in, see git-mergetool.html in their documentation:
Valid merge tools are: araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3, meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff.
There is still a glitch as it calls BCompare.exe and not BComp.com but changing the local Git setting will have no effect for bc3 as it's already built-in the system.
So in short, for current msysgit, simple do:
git config --global diff.tool bc3
git config --global merge.tool bc3
11-Oct-2011, 03:17 PM
Our Git for Windows instructions were recently updated just a few days ago with this change. It also includes the "mergetool.bc3.path" to point to bcomp.exe. Would this behave as you expect?
06-Sep-2012, 03:33 AM
Hi, I used the instructions for Subversion diff on Linux (Ubuntu 12.04)
/usr/bin/bcompare "$6" "$7" -title1="$3" -title2="\"$5\"" -readonly
but it did not work, BC3 opened in merge mode.
/usr/bin/bcompare "$6" "$7" -title1="$3" -title2="$5" -readonly
works better. What are the extra quotes for?
06-Sep-2012, 09:07 AM
It is a method of passing actual " characters along the command line (each \" is equal to ", then that itself is surrounded by ").
It is likely depending on your version of Linux, you might need one or the other method. For Ubuntu 12.04, it would seem you only need the simpler "$p" definition.
vBulletin® v3.7.1, Copyright ©2000-2013, Jelsoft Enterprises Ltd.