garretttaco/bcompare-git.md

Forked from jfromaniello/bcompare-git.md

Created September 11, 2017 17:13

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/garretttaco/42fd67666dc2de5059ef60b97df77c90.js"></script>
Save garretttaco/42fd67666dc2de5059ef60b97df77c90 to your computer and use it in GitHub Desktop.

Download ZIP

Integrate beyond compare 4 with git

Raw

bcompare-git.md

Install command line tools:

then run this:

git config --global diff.tool bc3
git config --global difftool.bc3 trustExitCode true
git config --global merge.tool bc3
git config --global mergetool.bc3 trustExitCode true
ln -s /usr/local/bin/bcomp /usr/local/bin/bc3

now use git difftool and git mergetool.

SourceTree

For diff:

Visual Diff Tool: Other, Command: /usr/local/bin/bcomp, Arguments: $LOCAL $REMOTE

For merge:

Visual Diff Tool: Other, Command: /usr/local/bin/bcomp, Arguments: $LOCAL $REMOTE $BASE -mergeoutput=$MERGED