Make the output of "svn help log switch" agree with the test-case.
* subversion/clients/cmdline/main.c
(svn_cl__cmd_table): Remove extra space from usage message.
* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Relocate the --relocate explanation.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-951-integration@846243 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/clients/cmdline/main.c b/subversion/clients/cmdline/main.c
index 486499d..f94b9ed 100644
--- a/subversion/clients/cmdline/main.c
+++ b/subversion/clients/cmdline/main.c
@@ -476,7 +476,7 @@
"Update working copy to mirror a new URL\n"
"usage: switch URL [PATH] or\n"
" switch --relocate FROM TO [PATH ... ]\n\n"
- " Note: this is the way to move a working copy to a new branch.\n",
+ " Note: this is the way to move a working copy to a new branch.\n",
{ 'r', 'N', 'q', svn_cl__merge_cmd_opt, svn_cl__relocate_opt,
SVN_CL__AUTH_OPTIONS} },
diff --git a/subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout b/subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout
index d85a6be..6eb3e11 100644
--- a/subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout
+++ b/subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout
@@ -50,9 +50,9 @@
-N [--non-recursive] : operate on single directory only
-q [--quiet] : print as little as possible
--diff3-cmd arg : Use ARG as merge command
+ --relocate : relocate via url-rewriting
--username arg : specify a username ARG
--password arg : specify a password ARG
--no-auth-cache : do not cache authentication tokens
--non-interactive : do no interactive prompting
- --relocate : relocate via url-rewriting
