You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/02/02 15:21:56 UTC
svn commit: r1066479 - /subversion/trunk/subversion/svn/main.c
Author: stsp
Date: Wed Feb 2 14:21:56 2011
New Revision: 1066479
URL: http://svn.apache.org/viewvc?rev=1066479&view=rev
Log:
* subversion/svn/main.c
(svn_cl__cmd_table): Tidy up stray whitespace in merge help text.
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=1066479&r1=1066478&r2=1066479&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed Feb 2 14:21:56 2011
@@ -773,7 +773,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
"\n"
"\n"
" 2. The second form is called a \"reintegrate merge\":\n"
- " svn merge --reintegrate SOURCE[@REV] [TARGET_WCPATH] \n"
+ " svn merge --reintegrate SOURCE[@REV] [TARGET_WCPATH]\n"
"\n"
" SOURCE is the URL of a branch to be merged back into (usually) its\n"
" immediate ancestor branch. If REV is specified, it is used a\n"
@@ -915,7 +915,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
"\n"
" NOTE: Subversion uses the svn:mergeinfo property to track merge\n"
" history. This property is considered at the start of a merge to\n"
- " determine what to merge and it is updated at the conclusion of the\n"
+ " determine what to merge and it is updated at the conclusion of the\n"
" merge to describe the merge that took place. Mergeinfo is used only\n"
" if the two sources are on the same line of history -- if the first\n"
" source is an ancestor of the second, or vice-versa. This is guaranteed\n"