* subversion/libsvn_client/merge.c
  (conflict_resolver): Improve the doc string.
  (merge_file_changed): Correct a comment.

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