Hi! Love the tool, used on PC, Linux, and now moving to mac. I have bc4.1.6 eval and git 2.9.2 on Mac OS X 10.11.5. When I run "git difftool origin/master," the first file difference shows up like normal. I close bc, waiting for the next diff. That file happens to open a quick compare window that says the file are binary same. I click close there (or command-W), and the shell running git difftool is just hung. I have to ctrl-Z, kill /usr/local/bin/bcomp and/or git difftool processes. But beyond compare is not listed in the force quit window.
If I choose "Open view" on the quick compare window, then close the beyond compare window, diffs keep coming like you'd expect. I would just like to avoid opening the "no diff" view and just skip to the next file, but this seems to leave bcomp not quite closed, but not quite open.
Any ideas? .git config has:
[diff]
tool = bcomp
[difftool]
prompt = false
[difftool "bcomp"]
trustExitCode = true
cmd = "/usr/local/bin/bcomp" \"$LOCAL\" \"$REMOTE\"
[merge]
tool = bcomp
[mergetool]
prompt = false
[mergetool "bcomp"]
trustExitCode = true
cmd = "/usr/local/bin/bcomp" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
If I choose "Open view" on the quick compare window, then close the beyond compare window, diffs keep coming like you'd expect. I would just like to avoid opening the "no diff" view and just skip to the next file, but this seems to leave bcomp not quite closed, but not quite open.
Any ideas? .git config has:
[diff]
tool = bcomp
[difftool]
prompt = false
[difftool "bcomp"]
trustExitCode = true
cmd = "/usr/local/bin/bcomp" \"$LOCAL\" \"$REMOTE\"
[merge]
tool = bcomp
[mergetool]
prompt = false
[mergetool "bcomp"]
trustExitCode = true
cmd = "/usr/local/bin/bcomp" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
Comment