Author: stsp
Date: Sat Mar 15 12:08:52 2014
New Revision: 1577835
URL: http://svn.apache.org/r1577835
Log:
* subversion/svn/svn.c
(svn_cl__cmd_table): Grammar and wording tweak for svn merge --force
option help string.
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=1577835&r1=1577834&r2=1577835&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Sat Mar 15 12:08:52 2014
@@ -1142,7 +1142,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
{'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, 'v'},
- { { opt_force, N_("force deletions even if the contents doesn't match") } }
+ { { opt_force, N_("force deletions even if deleted contents don't match")
} }
},
{ "mergeinfo", svn_cl__mergeinfo, {0}, N_
