Resolving a move-edit tree-conflict without doing move-update must
break the move into a copy+delete.

* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_resolve_break_moved_away): New.

* subversion/libsvn_wc/wc_db_update_move.c
  (resolve_break_moved_away, svn_wc__db_resolve_break_moved_away): New.

* subversion/libsvn_wc/conflicts.c
  (resolve_conflict_on_node): Call new function.


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