drei01/bcompare-git.md

Forked from jfromaniello/bcompare-git.md

Last active August 29, 2015 14:28

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

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/drei01/49d40f209e38adead16f.js"></script>
Save drei01/49d40f209e38adead16f 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

now use git difftool and git mergetool.

To remove unwanted .orig files

git config --global mergetool.keepBackup false

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