The Wiert Corner – irregular stream of stuff

Jeroen W. Pluimers on .NET, C#, Delphi, databases, and personal interests

  • My work

  • My badges

  • Twitter Updates

  • My Flickr Stream

  • Pages

  • All categories

  • Enter your email address to subscribe to this blog and receive notifications of new posts by email.

    Join 1,798 other followers

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:

  1. Start the UI version of Beyond Compare
  2. Select the Beyond Compare menu, install the command-line tools

  3. Note where they are installed:
  4. Start SourceTree, then go to the Preferences (use the Cauliflower+Comma keyboard shortcut)
  5. Set both Visual Diff Tool and Merge Tool to Other, then set both the Diff Command and Merge Command to the value you obtained above (in my case /usr/local/bin/bcomp) and these arguments:
    1. 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 /tmp as those will be lost during a reboot).
    2. Merge Command Arguments
      "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
      New Screenshot:
      SourceTree 2.1 still doesn't recognise that Beyond Compare is installed.
      Old Screenshot:

–jeroen

3 Responses to “Mac OS X: integrating Beyond Compare 4 into SourceTree 2.x”

  1. 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!

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

 
%d bloggers like this: