* subversion/svn/conflict-callbacks.c   (handle_text_conflict): Clearly label merge conflicts as such, to mark    the difference to tree and property conflicts. Users may now encounter    new text/prop conflicts after resolving a tree conflict interactively.    Hopefully, this wording tweak makes things a bit less confusing.
* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Clearly label merge conflicts as such, to mark
   the difference to tree and property conflicts. Users may now encounter
   new text/prop conflicts after resolving a tree conflict interactively.
   Hopefully, this wording tweak makes things a bit less confusing.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1739923 13f79535-47bb-0310-9956-ffa450edef68

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