svn commit: r1748521 - /subversion/trunk/subversion/svn/conflict-callbacks.c

[st...@apache.org]

Author: stsp
Date: Wed Jun 15 08:39:25 2016
New Revision: 1748521

URL: http://svn.apache.org/viewvc?rev=1748521&view=rev
Log:
* subversion/svn/conflict-callbacks.c
  (builtin_resolver_options): Stop providing short descriptions for the 'r'
   option. The longer descriptions for 'r' provided by libsvn_client are much
   better, so let's not require users to type '?' to see them.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1748521&r1=1748520&r2=1748521&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Jun 15 08:39:25 2016
@@ -388,7 +388,7 @@ typedef struct resolver_option_t
 /* Resolver options for conflict options offered by libsvn_client.  */
 static const resolver_option_t builtin_resolver_options[] =
 {
-  { "r",  N_("mark resolved"),    NULL,
+  { "r",  NULL, NULL,
                                   svn_client_conflict_option_merged_text,
                                   SVN_CL__ACCEPT_WORKING },
   { "mc", NULL, NULL,
@@ -408,7 +408,7 @@ static const resolver_option_t builtin_r
                                   SVN_CL__ACCEPT_POSTPONE },
 
   /* This option resolves a tree conflict to the current working copy state. */
-  { "r", N_("accept current working copy state"), NULL,
+  { "r", NULL, NULL,
     svn_client_conflict_option_accept_current_wc_state,
     SVN_CL__ACCEPT_WORKING },