Author: stsp
Date: Wed Apr 20 17:05:04 2016
New Revision: 1740170
URL: http://svn.apache.org/viewvc?rev=1740170&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(configure_option_merge_incoming_added_file_replace): Tweak this resolution
option's description slightly.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1740170&r1=1740169&r2=1740170&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Apr 20 17:05:04
2016
@@ -4527,7 +4527,7 @@ configure_option_merge_incoming_added_fi
conflict->local_abspath, scratch_pool,
scratch_pool));
option->description =
- apr_psprintf(options->pool, _("delete '%s', copy '^/%s@%ld' here"),
+ apr_psprintf(options->pool, _("delete '%s' and copy '^/%s@%ld' here"),
svn_dirent_local_style(
svn_dirent_skip_ancestor(wcroot_abspath,
conflict->local_abspath),
