* subversion/libsvn_client/conflicts.c   (describe_incoming_add_upon_merge): Fix typo in description string.
* subversion/libsvn_client/conflicts.c
  (describe_incoming_add_upon_merge): Fix typo in description string.


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

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