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/01/28 16:06:05 UTC

svn commit: r1727378 - /subversion/trunk/subversion/libsvn_client/resolved.c

Author: stsp
Date: Thu Jan 28 15:06:05 2016
New Revision: 1727378

URL: http://svn.apache.org/viewvc?rev=1727378&view=rev
Log:
* subversion/libsvn_client/resolved.c
  (text_conflict_options): Shorten option descriptions a bit.

Modified:
    subversion/trunk/subversion/libsvn_client/resolved.c

Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1727378&r1=1727377&r2=1727378&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Thu Jan 28 15:06:05 2016
@@ -819,14 +819,14 @@ static const svn_client_conflict_option_
 
   {
     svn_client_conflict_option_incoming_text_where_conflicted,
-    N_("accept incoming changes only where they conflict"),
+    N_("accept changes only where they conflict"),
     NULL,
     resolve_text_conflict
   },
 
   {
     svn_client_conflict_option_working_text_where_conflicted,
-    N_("reject incoming changes which conflict and accept the rest"),
+    N_("reject changes which conflict and accept the rest"),
     NULL,
     resolve_text_conflict
   },