On the tree-conflicts branch, improve wording in a comment.
On the tree-conflicts branch, improve wording in a comment.

* subversion/libsvn_client/merge.c
  (merge_file_deleted): Make comment about when we have a tree
   conflict more explicit.


git-svn-id: 080e87057772675a7b26c87dbedb1538c5b5954e@870152 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion