Integrate beyond compare 4 with git

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

I've had this working fine for a couple years ~ I'm on Windows but just change the path to your install on nix | macOs

~/.gitconfig

[merge]
	tool = bc4
[mergetool]
	prompt = false

[diff]
	tool = bc4
	stat = true
	guitool = bc4
[difftool]
	prompt = false
[difftool "bc4"]
    path = \"C:/Program Files/Beyond Compare 4/bcomp.exe\"
    cmd = \"C:/Program Files/Beyond Compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
    trustExitCode = true
[mergetool "bc4"]
    path = \"C:/Program Files/Beyond Compare 4/bcomp.exe\"
    cmd =  \"C:/Program Files/Beyond Compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
    trustExitCode = true