* subversion/libsvn_client/merge.c
  (CONFLICT_REASON_EXCLUDED): Remove unused value and renumber others.
  (merge_dir_baton_t): Update documentation.
  (mark_dir_edited,
   mark_file_edited): Remove check for magic value.


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