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 2018/09/16 08:57:23 UTC
svn commit: r1840990 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Sun Sep 16 08:57:23 2018
New Revision: 1840990
URL: http://svn.apache.org/viewvc?rev=1840990&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(svn_client_conflict_text_get_resolution_options): Use more precise wording
in 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=1840990&r1=1840989&r2=1840990&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Sun Sep 16 08:57:23 2018
@@ -9381,13 +9381,13 @@ svn_client_conflict_text_get_resolution_
add_resolution_option(*options, conflict,
svn_client_conflict_option_incoming_text_where_conflicted,
_("Accept incoming for conflicts"),
- _("accept changes only where they conflict"),
+ _("accept incoming changes only where they conflict"),
resolve_text_conflict);
add_resolution_option(*options, conflict,
svn_client_conflict_option_working_text_where_conflicted,
_("Reject conflicts"),
- _("reject changes which conflict and accept the rest"),
+ _("reject incoming changes which conflict and accept the rest"),
resolve_text_conflict);
add_resolution_option(*options, conflict,