You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2012/09/07 20:59:10 UTC
svn commit: r1382125 - /subversion/trunk/subversion/svn/main.c
Author: julianfoad
Date: Fri Sep 7 18:59:10 2012
New Revision: 1382125
URL: http://svn.apache.org/viewvc?rev=1382125&view=rev
Log:
* subversion/svn/main.c
(svn_cl__cmd_table): Correct the amount of white-space after backslashes
in diagrams in the merge help text. A follow-up to r1370818.
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=1382125&r1=1382124&r2=1382125&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Fri Sep 7 18:59:10 2012
@@ -775,9 +775,9 @@ const svn_opt_subcommand_desc2_t svn_cl_
" merging the other way, into a trunk working copy.\n"
"\n"
" trunk --+----------o------o-o-------------o--\n"
-" \\ \\ \\ /\n"
-" \\ merge merge merge\n"
-" \\ \\ \\ /\n"
+" \\ \\ \\ /\n"
+" \\ merge merge merge\n"
+" \\ \\ \\ /\n"
" feature +--o-o-------o----o-o----o-------\n"
"\n"
" In this pattern, a merge from the parent branch to the feature branch\n"
@@ -793,9 +793,9 @@ const svn_opt_subcommand_desc2_t svn_cl_
" ............\n"
" . .\n"
" trunk --+------------L--------------R------\n"
-" \\ \\\n"
-" \\ |\n"
-" \\ v\n"
+" \\ \\\n"
+" \\ |\n"
+" \\ v\n"
" feature +------------------------o-----\n"
" r100 r200\n"
"\n"
@@ -827,9 +827,9 @@ const svn_opt_subcommand_desc2_t svn_cl_
"\n"
" rW rX\n"
" trunk ------+--------------------L------------------o\n"
-" \\ . ^\n"
-" \\ ............. /\n"
-" \\ . /\n"
+" \\ . ^\n"
+" \\ ............. /\n"
+" \\ . /\n"
" feature +--------------------------------R\n"
"\n"
" In the diagram above, L marks the left side (trunk@X) and R marks the\n"