Author: julianfoad
Date: Mon Apr 16 14:30:04 2018
New Revision: 1829288
URL: http://svn.apache.org/viewvc?rev=1829288&view=rev
Log:
On the 'shelve-checkpoint' branch: fix wrongly resolved conflict from r1829257.
Modified:
subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c
Modified: subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c?rev=1829288&r1=1829287&r2=1829288&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c
(original)
+++ subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c Mon
Apr 16 14:30:04 2018
@@ -386,7 +386,7 @@ static const svn_opt_subcommand_desc3_t
{"freeze", subcommand_freeze, {0}, {N_(
"usage: 1. svnadmin freeze REPOS_PATH -- PROGRAM [ARG...]\n"
- " 2. svnadmin freeze -F FILE -- PROGRAM [ARG...]\n\n"
+ " 2. svnadmin freeze -F FILE -- PROGRAM [ARG...]\n"
"\n"), N_(
"1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n"
" Allows safe use of third-party backup tools on a live repository.\n"
