* subversion/libsvn_wc/conflicts.c
  (resolve_conflict_on_node): Only do move-update stuff when the
   moved-away conflict is reason=edit.  This fixes a SEGV
   resolving reason=delete conflicts.


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