* subversion/libsvn_client/conflicts.c (resolve_incoming_delete_accept): If deleting the node fails because it is not versioned, we must clear the tree conflict marker manually.
subversion/trunk/subversion/libsvn_client/conflicts.c