For using WinMerge in Subclipse, What are the parameters in Preferences > Team > SVN > Diff/Merge?

Is this correct?

/dl "Base" /dr "Mine" "${base}" "${mine}"
有帮助吗?

解决方案

Subclipse only supports using an external tool for resolving conflicts which generally requires a tool that can do a 3-way diff. I do not see where WinMerge supports this from the command line.

许可以下: CC-BY-SA归因
不隶属于 StackOverflow
scroll top