Mac OS X: integrating Beyond Compare 4 into SourceTree 2.x
Posted by jpluimers on 2015/12/28
Unlike SourceTree for Windows, SourceTree for Mac still doesn’t automagically detect Beyond Compare even though that has been available for Mac OS X since : [SRCTREE-2092] Add built-in support for Beyond Compare version 4 – Atlassian JIRA.
Even modifying my ~/.gitconfig didn’t work, but manual configuration did. Here are the steps:
- Start the UI version of Beyond Compare
- Select the Beyond Compare menu, install the command-line tools
- Note where they are installed:
- Start SourceTree, then go to the Preferences (use the Cauliflower+Comma keyboard shortcut)
- Set both
Visual Diff ToolandMerge TooltoOther, then set both theDiff CommandandMerge Commandto the value you obtained above (in my case/usr/local/bin/bcomp) and these arguments:Diff Command Arguments
"$LOCAL" "$REMOTE"Edit: Previously this was listed as
-ro "$LOCAL" "$REMOTE", but that leads to a read-only view which often you do not want (but be careful not to save your changes in/tmpas those will be lost during a reboot).Merge Command Arguments
"$LOCAL" "$REMOTE" "$BASE" "$MERGED"New Screenshot:
Old Screenshot:
–jeroen
The Wiert Corner - irregular stream of stuff 
Ray Konopka said
FYI, SourceTree 2.3.1 includes support for BeyondCompare. That is, in the drop-down, instead of setting it to Other, you can now set it to BeyondCompare. The External Diff command will then bring up BeyondCompare.
jpluimers said
Did they finally fix that? I refrained from upgrading both the Mac and Windows versions for a long time as each upgrade made things worse from UX, stability and CPU (battery!) usage.
So how’s 2.3.1?
jpluimers said
I just checked again: SourceTree 2.1 on Mac still fails to recognise my Beyond Compare install…
See you tomorrow at EKON 20!