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

[st...@apache.org]

Author: stsp
Date: Fri Dec  9 15:34:31 2011
New Revision: 1212482

URL: http://svn.apache.org/viewvc?rev=1212482&view=rev
Log:
* subversion/svn/main.c
  (svn_cl__cmd_table): Comma fix in merge help text.

Found by: danielsh

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=1212482&r1=1212481&r2=1212482&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Fri Dec  9 15:34:31 2011
@@ -915,7 +915,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
 "     merge is necessary.\n"
 "\n"
 "     The 'bar' branch has been synced with trunk up to revision 500.\n"
-"     (If this revision number is not known it can be located using the\n"
+"     (If this revision number is not known, it can be located using the\n"
 "     'svn log' and/or 'svn mergeinfo' commands.)\n"
 "     The difference between trunk@500 and bar@HEAD contains the complete\n"
 "     set of changes related to feature 'bar', and no other changes. These\n"