Skip to content

Instantly share code, notes, and snippets.

@7u4

7u4/bcompare-git.md

Forked from jfromaniello/bcompare-git.md
Created April 8, 2016 04:41
Show Gist options
  • Save 7u4/2fe8f9e0410754834333fe65d727d30a to your computer and use it in GitHub Desktop.
Save 7u4/2fe8f9e0410754834333fe65d727d30a 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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment