* subversion/libsvn_wc/conflicts.h
  (svn_wc__conflict_invoke_resolver): Improve the doc string.

* subversion/libsvn_wc/props.h
  (svn_wc__merge_props): Improve the doc string.

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