* subversion/libsvn_client/merge.c   (tree_conflict): Fix the doc string which was out of date.
* subversion/libsvn_client/merge.c
  (tree_conflict): Fix the doc string which was out of date.

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