Collect conflicted paths during merge using the result of the merge instead of
via the conflict callback.

* subversion/libsvn_client/merge.c
  (merge_dir_props_changed): Check property merge result and store path as
    conflicted if necessary.
  (conflict_resolver_baton_t): Remove unneeded struct.
  (conflict_resolver): Remove unneeded function.
  (merge_file_changed): Store path if property or text merge caused a conflict.


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