* subversion/libsvn_wc/conflicts.c
  (resolve_conflict_on_node): Remove support for reverting the delete-half
   of a move from within the conflict resolver by choosing 'theirs-conflict'.
   Instead, make 'theirs-conflict' break the move. The revert can still be
   done manually if needed, and offering this option in addition to the
   others clutters the interactive conflict user interface too much.
   While here, add a comment explaining why 'choose_merged' breaks the move.


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