What are the parameters for using WinMerge in Subclipse?

3k views Asked by At

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

Is this correct?

/dl "Base" /dr "Mine" "${base}" "${mine}"
1

There are 1 answers

5
Mark Phippard On BEST ANSWER

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.