How to configure Beyond Compare 3 for Eclipse conflict resolution?
- by Peter Boughton
What is the correct parameters to get Beyond Compare 3 working with Eclipse/Subclipse conflict resolution?
In Preferences > Team > SVN > Diff/Merge there's the option to specify an external program to resolve conflicts.
The default parameters are:
"${yours}" "${theirs}" "${base}" "${merged}"
And it suggests TortoiseMerge settings of this:
/theirs:"${theirs}" /base:"${base}" /mine:"${yours}" /merged:"${merged}"
But what is the appropriate config for Beyond Compare?