Menu
git config --global mergetool.bc3 "\"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
git mergetool
/usr/lib/git-core/git-mergetool--lib: line 116: bcompare: command not found
This is extremely odd, because both ./.git/config and ~/.gitconfig look correct. Neither lists an entry for bcompare. Can git read or store configuration from anywhere other than .git/config or ~/.gitconfig?
829
Use :cquit , or git merge --abort and do the merge again.
Use git mergetool to run one of several merge utilities to resolve merge conflicts. It is typically run after git merge. If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without conflicts).
The git mergetool helps the developer to resolve conflicts in an efficient way. It provides a GUI where you can look at versions from your current branch, remote branch, common ancestor and final merged version, all in one window, which we will see going further into the article.
Looks like the same issue as this guy had. It appears bc3 is a builtin tool name, and git won't allow that name to be overridden. Try using a name other than bc3.
I used "BeyondCompare3"
[mergetool "BeyondCompare3"]
path = C:/Program Files/Beyond Compare 3/bcomp.exe
cmd = \"C:/Program Files/Beyond Compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
