如何在比较3之外配置Eclipse冲突解决方案?

看起来这是正确的:

"${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

也签出 http://beyondcvs.sourceforge.net/ 对于Eclipse/Beyond比较插件。(来自: http://www.scootersoftware.com/support.php?zz=kb_vcs )

安克斯维因使用

对于三向差分:

"$(ProgramFiles)\Beyond Compare 3\BComp.exe" "$(Mine)" "$(Theirs)" "$(Base)" "$(Merged)" /title1="$(MineName)" /title2="$(TheirsName)" /title3="$(BaseName)" /title4="$(MergedName)"

或2路:

"$(ProgramFiles)\Beyond Compare 3\BComp.exe" "$(Mine)" "$(Theirs)" /mergeoutput="$(Merged)" /title1="$(MineName)" /title2="$(TheirsName)" 

您可能可以将其调整为Subclipse的格式。