Fix build.

Pointyhat:	gjb
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2013-12-09 16:25:24 +00:00
parent 77db3bf8bb
commit 214d6f9e50
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=43317

View file

@ -1138,7 +1138,7 @@
always originate from the corresponding
<literal>stable/</literal> branch. For example:</para>
<screen>&prompt.user; svn merge -c <replaceable>r123456</replaceable> ^/stable/<replaceable>10</replaceable> releng/<replaceable>10.0</replaceable>
<screen>&prompt.user; svn merge -c <replaceable>r123456</replaceable> ^/stable/<replaceable>10</replaceable> releng/<replaceable>10.0</replaceable></screen>
</sect4>
<sect4 xml:id="oldmerge">