Author: julianfoad
Date: Wed Dec 5 02:01:14 2012
New Revision: 1417268
URL: http://svn.apache.org/viewvc?rev=1417268&view=rev
Log:
* subversion/svn/svn.c
(svn_cl__cmd_table): Make 'svn merge' accept -v|--verbose, switching on
the progress messages added in r1417205.
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=1417268&r1=1417267&r2=1417268&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Wed Dec 5 02:01:14 2012
@@ -1036,7 +1036,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" repositories.\n"),
{'r', 'c', 'N', opt_depth, 'q', opt_force, opt_dry_run, opt_merge_cmd,
opt_record_only, 'x', opt_ignore_ancestry, opt_accept, opt_reintegrate,
- opt_allow_mixed_revisions} },
+ opt_allow_mixed_revisions, 'v'} },
{ "mergeinfo", svn_cl__mergeinfo, {0}, N_
("Display merge-related information.\n"
