handle delete/edit conflic

http://subversion.tigris.org/issues/show_bug.cgi?id=2282




User dionisos changed the following:

                What    ld value 
               |New value
============================================================
====================
OtherIssuesDependingOnTh|                          |2261
                      is|                          |
------------------------------------------------------------
--------------------




------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org