1.1 --- a/en/ch02-tour-merge.xml	Mon Apr 06 23:15:52 2009 -0700
     1.2 +++ b/en/ch02-tour-merge.xml	Fri Apr 24 00:27:05 2009 -0700
     1.3 @@ -164,7 +164,7 @@
     1.4  	</mediaobject>
     1.5        </figure>
     1.6  
     1.7 -      <para>We sometimes talk about a merge having
     1.8 +      <para id="x_69c">We sometimes talk about a merge having
     1.9  	<emphasis>sides</emphasis>: the left side is the first parent
    1.10  	in the output of <command role="hg-cmd">hg parents</command>,
    1.11  	and the right side is the second.  If the working directory