1.1 --- a/en/ch03-concepts.xml	Thu Apr 09 22:52:16 2009 -0700
     1.2 +++ b/en/ch03-concepts.xml	Thu Apr 16 23:46:45 2009 -0700
     1.3 @@ -524,13 +524,13 @@
     1.4      <sect2>
     1.5        <title>Merging and renames</title>
     1.6  
     1.7 -      <para>A surprising number of revision control systems pay little
     1.8 +      <para id="x_69a">A surprising number of revision control systems pay little
     1.9  	or no attention to a file's <emphasis>name</emphasis> over
    1.10  	time.  For instance, it used to be common that if a file got
    1.11  	renamed on one side of a merge, the changes from the other
    1.12  	side would be silently dropped.</para>
    1.13  
    1.14 -      <para>Mercurial records metadata when you tell it to perform a
    1.15 +      <para id="x_69b">Mercurial records metadata when you tell it to perform a
    1.16  	rename or copy. It uses this metadata during a merge to do the
    1.17  	right thing in the case of a merge.  For instance, if I rename
    1.18  	a file, and you edit it without renaming it, when we merge our