svn commit: r1154121 - /subversion/trunk/subversion/svn/main.c

[ju...@apache.org]

Author: julianfoad
Date: Fri Aug  5 08:26:51 2011
New Revision: 1154121

URL: http://svn.apache.org/viewvc?rev=1154121&view=rev
Log:
* subversion/svn/main.c
  (svn_cl__cmd_table): Mention in the help that 'mergeinfo' defaults to depth
    'empty' and allows depths 'empty' and 'infinity'.

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

Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1154121&r1=1154120&r2=1154121&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Fri Aug  5 08:26:51 2011
@@ -932,7 +932,9 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "  Display information related to merges (or potential merges) between\n"
      "  SOURCE and TARGET (default: '.').  Display the type of information\n"
      "  specified by the --show-revs option.  If --show-revs isn't passed,\n"
-     "  it defaults to --show-revs='merged'.\n"),
+     "  it defaults to --show-revs='merged'.\n"
+     "\n"
+     "  The depth can be 'empty' or 'infinity'; the default is 'empty'.\n"),
     {'r', 'R', opt_depth, opt_show_revs} },
 
   { "mkdir", svn_cl__mkdir, {0}, N_