* subversion/libsvn_client/conflicts.c   (configure_option_merge_incoming_added_file_replace): Tweak this resolution    option's description slightly.
* subversion/libsvn_client/conflicts.c
  (configure_option_merge_incoming_added_file_replace): Tweak this resolution
   option's description slightly.


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

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