diff en/ch02-tour-merge.xml @ 827:d2aacc06e562

Add more paragraph IDs

--- a/en/ch02-tour-merge.xml	Sun May 03 20:27:09 2009 -0700
+++ b/en/ch02-tour-merge.xml	Sun May 03 20:27:28 2009 -0700
@@ -48,7 +48,7 @@
 
     &interaction.tour.merge.cat1;
 
-    <para>And here is our slightly different version from the other
+    <para id="x_722">And here is our slightly different version from the other
       repository.</para>
 
     &interaction.tour.merge.cat2;
@@ -131,7 +131,7 @@
 	  -C</command> would revert any uncommitted changes in the
 	working directory.)</para>
 
-      <para>To start a merge between the two heads, we use the
+      <para id="x_723">To start a merge between the two heads, we use the
 	<command role="hg-cmd">hg merge</command> command.</para>
 
       &interaction.tour.merge.merge;
@@ -355,7 +355,7 @@
       <note>
 	<title>Where is the <command>hg resolve</command> command?</title>
 
-	<para>The <command>hg resolve</command> command was introduced
+	<para id="x_724">The <command>hg resolve</command> command was introduced
 	  in Mercurial 1.1, which was released in December 2008. If
 	  you are using an older version of Mercurial (run <command>hg
 	    version</command> to see), this command will not be