When I go to run mergetool I get a text compare window instead of text merge. The text compare windows is between LOCAL and REMOTE. I can't complete my merges because text compare doesn't allow you to actually merge (no merge output). Here is my .gitconfig for DT and MT:
Does BC4 for mac support merging? If so, why is it not working on my mac. Thank you in advance.
Code:
[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