Issue 532: Add "Edit Conflicts" command (using a 3 file diff tool)

I have implemented this feature, and attached a patch to the
bug report. 
http://rapidsvn.tigris.org/issues/show_bug.cgi?id=532

I am not familiar with RapidSVN or wxWidgets, so I'm not
sure I 
implemented in the best possible way. Please let me know if
I should do 
it differently. Also, I wasn't sure what the command should
be named, so 
I called it "Interactive Resolve." Please let me
know if it should have 
a different name.

I am also planning to edit the wiki to write a guide with
building 
instructions for Windows. Do you think that would be
useful?

Thank You
Roland

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscriberapidsvn.tigris.org
For additional commands, e-mail: dev-helprapidsvn.tigris.org