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?
Looks like this is correct:
"${theirs}" "${yours}" "${base}" "${merged}"
Based on this forum post: http://www.scootersoftware.com/vbulletin/showthread.php?t=368#4
To label the sections appropriately, and run BC in a separate (solo) instance, it's this:
"${theirs}" "${yours}" "${base}" "${merged}"
/lefttitle="Incoming (${theirs})"
/centertitle="Base (${base})"
/righttitle="Local (${yours})"
/outputtitle="Merged (${merged})"
/solo
Multiple lines used above for readability, replace linebreaks with spaces for use, i.e.
"${theirs}" "${yours}" "${base}" "${merged}" /lefttitle="Incoming (${theirs})" /centertitle="Base (${base})" /righttitle="Local (${yours})" /outputtitle="Merged (${merged})" /solo