Issues Configuring Git Difftool on Mac

[mattcdavis1]

When trying to use git difftool on my Macbook Pro (Mavericks) i am only seeing the current version of the file on the right and not the original version.

my git version is: 1.8.3.4 (Apple Git-47)

When configured to use Kaleidescope, the diff works fine. But not with BC4. I also tried copying the same settings as Kaleidescope to BC4 but it still did not work.

Could someone provide a working git config for Mac Mavericks? Also, would be nice if this could be auto-configured as Kaleidescope does.

Below is a copy of my git config:

[user]
name = Matt Davis
email = [email protected]
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool "bc3"]
cmd = bcompare \"$LOCAL\" \"$REMOTE\"
trustExitCode = true
[difftool]
prompt = false
[diff]
tool = bc3
[core]
excludesfile = /Users/mattcdavis1/.gitignore_global
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
keepBackup = false
[merge]
tool = Kaleidoscope
[color]
ui = true
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[pack]
windowMemory = 100m
SizeLimit = 100m
threads = 1

[Aaron]

You will need to use the Beyond Compare menu -> Install Command Line Tools to get the necessary bcomp and bcompare tools. Beyond Compare.app will not work well from a VCS. We have Git (and other examples) here:
http://www.scootersoftware.com/vbull...ad.php?t=11677