diff en/ch03-concepts.xml @ 775:29f0f79cf614

Update paragraph IDs

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