Mercurial > hg > Members > kono > nitros9-code

diff docs/nitros9guide/merge.refentry @ 975:c565a4700689

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The entitity replstart was replaced with <replaceable>
author roug
date Sat, 01 Feb 2003 20:25:53 +0000
parents d9631713b7cd
children b5ff125a1d60
line wrap: on
line diff
--- a/docs/nitros9guide/merge.refentry	Sat Feb 01 16:35:40 2003 +0000
+++ b/docs/nitros9guide/merge.refentry	Sat Feb 01 20:25:53 2003 +0000
@@ -8,10 +8,10 @@
 <cmdsynopsis>
 <command>MERGE</command>
 <arg choice="plain">
-  &replstart;path&replend;
+  <replaceable>path</replaceable>
 </arg>
 <arg choice="plain">
- &repeatst; &replstart;path&replend; &repeaten;
+ &repeatst; <replaceable>path</replaceable> &repeaten;
 </arg>
 </cmdsynopsis>
 </refsynopsisdiv>