Record local moved-away involved in tree-conflicts as such during merges, instead of recording moved-away as deletions.
Record local moved-away involved in tree-conflicts as such during merges,
instead of recording moved-away as deletions.

* subversion/libsvn_client/merge.c
  (check_moved_away): New helper function. Wraps svn_wc__node_was_moved_away(),
   ignoring any path-not-found errors since, during a merge, files mentioned
   in the diff being merged might not exist locally.
  (merge_file_changed): Use tree-conflict reasons 'moved-away', 'deleted',
   or 'missing', depending on whether the file was locally moved-away, locally
   deleted, or is missing (possibly missing because it was moved/deleted in the
   history of the branch). Previously all these cases were flagged 'missing'.
  (merge_file_deleted, merge_dir_deleted, merge_dir_opened): Use tree-conflict
   reason 'moved-away' or 'deleted'. Previously only 'deleted' was used.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion