如何配置Beyond Compare 3 for Eclipse冲突解决方案？

Question

使Beyond Compare 3使用Eclipse/Subclipse冲突解决方案的正确参数是什么？

在Preferences > Team > SVN > Diff/Merge那里可以选择指定外部程序来解决冲突.

默认参数是:

"${yours}" "${theirs}" "${base}" "${merged}"

它建议TortoiseMerge设置:

/theirs:"${theirs}" /base:"${base}" /mine:"${yours}" /merged:"${merged}"

但Beyond Compare的适当配置是什么？

Answer 1

看起来这是正确的:

"${theirs}" "${yours}" "${base}" "${merged}"

基于此论坛帖子:http://www.scootersoftware.com/vbulletin/showthread.php？ t = 368#4

要适当地标记部分,并在单独的(独奏)实例中运行BC,它是这样的:

"${theirs}" "${yours}" "${base}" "${merged}"
/lefttitle="Incoming (${theirs})"
/centertitle="Base (${base})"
/righttitle="Local (${yours})"
/outputtitle="Merged (${merged})"
/solo

上面使用多行来提高可读性,用空格替换换行符,即

 "${theirs}" "${yours}" "${base}" "${merged}" /lefttitle="Incoming (${theirs})" /centertitle="Base (${base})" /righttitle="Local (${yours})" /outputtitle="Merged (${merged})" /solo