To get this working, you first need to install the Beyond Compare command line tools.
From the main menu, choose Beyond Compare -> Install Command Line Tools..., then follow the instructions.
That will install /usr/local/bin/bcomp and /usr/local/bin/bcompare on your Mac.
SourceTree configuration
Collapse
X
-
Guys, I made a request for adding BeyondCompare as a recognized diff/merge tool for SourceTree, please vote/add comments there.
https://jira.atlassian.com/browse/SRCTREE-2156Leave a comment:
-
-
Thanks for opening that request form. I've also updated the forum post with "-ro"Leave a comment:
-
-
A suggestion for the diff case is to use the "-ro" parameter to disable editing when viewing a diff.
Parameters:-ro $LOCAL $REMOTELeave a comment:
-
Side note: SourceTree has a built in list of compare tools.
Would be great to contact them to add BC to it.
I have seen somewhere else that someone suggested this, not sure if it was for SourceTree as well.
Oh and fyi, sourcetree just append to ~/.gitconfig this:
# sourcetree
[difftool "sourcetree"]
cmd = bcomp $LOCAL $REMOTE
path =
[mergetool "sourcetree"]
cmd = bcomp $LOCAL $REMOTE $BASE $MERGED
trustExitCode = trueLeave a comment:
-
SourceTree configuration
Visual Diff Tool: Other
Diff Command:/usr/local/bin/bcomp
Parameters:$LOCAL $REMOTE
Merge Tool: Other
Merge Command:/usr/local/bin/bcomp
Paramters:$LOCAL $REMOTE $BASE $MERGEDTags: None
Leave a comment: