There is clear explanation how to make BC a default tool for diff and merging for Subversion and Git when used not from within Eclipse. But what about the latter? I keep getting the following dialog:
UPDATE:
Added to my global .gitconfig and git difftool
command now works. Can't say the same about Eclipse. I can't get why it's so confusing to set up.
[diff]
tool = bc3
[difftool]
prompt = false
[difftool "bc3"]
cmd = \"C:/Program Files (x86)/Beyond Compare 3/BComp.exe\" "$LOCAL" "$REMOTE"
My Eclipse config now looks like:
This thread suggests:
- tinkering the the git config
Eclipse Preferences, under
Team -> Git -> Configuration
, it points to a.gitconfig
file. (and declare beyond compare as documented) - or... Use Intellij IDEA(!)
The integration of Beyond Compare and Eclipse itself is based on a plugin, so a direct integration between BC and EGit might not be possible directly through Eclipse.
This is a very old thread, but appears to have a new answer. The BC thread mentioned above had a fairly new entry mentioning Context Quickie. I installed that, configured it to use BC 4 in my case, and have a much more readable compare when in egit.
来源:https://stackoverflow.com/questions/17507729/how-to-make-beyond-compare-work-within-eclipse-with-git