You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/06/15 13:59:33 UTC
svn commit: r1748583 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Wed Jun 15 13:59:33 2016
New Revision: 1748583
URL: http://svn.apache.org/viewvc?rev=1748583&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(configure_option_incoming_move_file_merge,
svn_client_conflict_option_set_moved_to_abspath): Tweak option descriptions.
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=1748583&r1=1748582&r2=1748583&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Jun 15 13:59:33 2016
@@ -6917,8 +6917,7 @@ configure_option_incoming_move_file_merg
const char *);
option->description =
apr_psprintf(
- options->pool,
- _("follow move-away of '%s' and merge with '%s'"),
+ options->pool, _("move '%s' to '%s' and merge"),
svn_dirent_local_style(svn_dirent_skip_ancestor(wcroot_abspath,
victim_abspath),
scratch_pool),
@@ -7025,8 +7024,7 @@ svn_client_conflict_option_set_moved_to_
const char *);
option->description =
apr_psprintf(
- option->pool,
- _("follow move-away of '%s' and merge with '%s'"),
+ option->pool, _("move '%s' to '%s' and merge'"),
svn_dirent_local_style(svn_dirent_skip_ancestor(wcroot_abspath,
victim_abspath),
scratch_pool),