tree 124086d588bd9cdaf35b2f1027986074e9fdb23e
parent bc510b9cc94217ce409e6fe9abc01cbbdbff59f1
author Stefan Sperling <stsp@apache.org> 1467994132 +0000
committer Stefan Sperling <stsp@apache.org> 1467994132 +0000

* 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.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1751935 13f79535-47bb-0310-9956-ffa450edef68