You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2013/03/15 13:29:47 UTC

svn commit: r1456930 - /subversion/trunk/subversion/svn/svn.c

Author: julianfoad
Date: Fri Mar 15 12:29:47 2013
New Revision: 1456930

URL: http://svn.apache.org/r1456930
Log:
* subversion/svn/svn.c
  (svn_cl__cmd_table): Revert r1456636 in which I stupidly repeated a bit
    of help text that was already present.

Found by: bert
          stsp

Modified:
    subversion/trunk/subversion/svn/svn.c

Modified: subversion/trunk/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1456930&r1=1456929&r2=1456930&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Fri Mar 15 12:29:47 2013
@@ -1343,7 +1343,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
     {opt_targets, 'R', opt_depth, 'q', opt_accept},
     {{opt_accept, N_("specify automatic conflict resolution source\n"
                      "                             "
-                     "('working', 'base', 'working', 'mine-conflict',\n"
+                     "('base', 'working', 'mine-conflict',\n"
                      "                             "
                      "'theirs-conflict', 'mine-full', 'theirs-full')")}} },