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

[st...@apache.org]

Author: stsp
Date: Tue Jul 25 14:18:12 2017
New Revision: 1802947

URL: http://svn.apache.org/viewvc?rev=1802947&view=rev
Log:
* subversion/svn/svn.c
  (svn_cl__cmd_table): Reorder options in 'svn help cleanup' output and
   deprecate the unused --diff3-cmd option.

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=1802947&r1=1802946&r2=1802947&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Tue Jul 25 14:18:12 2017
@@ -638,9 +638,10 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "  To prevent accidental working copy corruption, this operation will\n"
      "  only succeed if the working copy is not already locked for writing by\n"
      "  another Subversion client.\n"),
-    {opt_merge_cmd, opt_remove_unversioned, opt_remove_ignored,
-     opt_include_externals, 'q', opt_vacuum_pristines} },
-
+    { opt_remove_unversioned, opt_remove_ignored, opt_vacuum_pristines,
+      opt_include_externals, 'q', opt_merge_cmd }, 
+    { { opt_merge_cmd, N_("deprecated and ignored") } } },
+      
   { "commit", svn_cl__commit, {"ci"},
     N_("Send changes from your working copy to the repository.\n"
        "usage: commit [PATH...]\n"