1.1 --- a/en/ch02-tour-merge.xml	Sun May 03 20:27:09 2009 -0700
     1.2 +++ b/en/ch02-tour-merge.xml	Sun May 03 20:27:28 2009 -0700
     1.3 @@ -48,7 +48,7 @@
     1.4  
     1.5      &interaction.tour.merge.cat1;
     1.6  
     1.7 -    <para>And here is our slightly different version from the other
     1.8 +    <para id="x_722">And here is our slightly different version from the other
     1.9        repository.</para>
    1.10  
    1.11      &interaction.tour.merge.cat2;
    1.12 @@ -131,7 +131,7 @@
    1.13  	  -C</command> would revert any uncommitted changes in the
    1.14  	working directory.)</para>
    1.15  
    1.16 -      <para>To start a merge between the two heads, we use the
    1.17 +      <para id="x_723">To start a merge between the two heads, we use the
    1.18  	<command role="hg-cmd">hg merge</command> command.</para>
    1.19  
    1.20        &interaction.tour.merge.merge;
    1.21 @@ -355,7 +355,7 @@
    1.22        <note>
    1.23  	<title>Where is the <command>hg resolve</command> command?</title>
    1.24  
    1.25 -	<para>The <command>hg resolve</command> command was introduced
    1.26 +	<para id="x_724">The <command>hg resolve</command> command was introduced
    1.27  	  in Mercurial 1.1, which was released in December 2008. If
    1.28  	  you are using an older version of Mercurial (run <command>hg
    1.29  	    version</command> to see), this command will not be