1.1 --- a/en/ch02-tour-merge.xml	Sun May 03 20:27:28 2009 -0700
     1.2 +++ b/en/ch02-tour-merge.xml	Mon May 04 23:52:38 2009 -0700
     1.3 @@ -146,6 +146,7 @@
     1.4  
     1.5        &interaction.tour.merge.parents;
     1.6      </sect2>
     1.7 +
     1.8      <sect2>
     1.9        <title>Committing the results of the merge</title>
    1.10  
    1.11 @@ -292,8 +293,8 @@
    1.12  	strengths and weaknesses.  Most are tuned for merging files
    1.13  	containing plain text, while a few are aimed at specialised
    1.14  	file formats (generally XML).</para>
    1.15 -
    1.16      </sect2>
    1.17 +
    1.18      <sect2>
    1.19        <title>A worked example</title>
    1.20  
    1.21 @@ -365,6 +366,7 @@
    1.22        </note>
    1.23      </sect2>
    1.24    </sect1>
    1.25 +
    1.26    <sect1 id="sec:tour-merge:fetch">
    1.27      <title>Simplifying the pull-merge-commit sequence</title>
    1.28  
    1.29 @@ -421,7 +423,27 @@
    1.30        the extension, but since the <literal
    1.31  	role="hg-ext">fetch</literal> extension is in the standard
    1.32        distribution, Mercurial knows where to search for it.)</para>
    1.33 -
    1.34 +  </sect1>
    1.35 +
    1.36 +  <sect1>
    1.37 +    <title>Renaming, copying, and merging</title>
    1.38 +
    1.39 +    <para>During the life of a project, we will often want to change
    1.40 +      the layout of its files and directories. This can be as simple
    1.41 +      as renaming a single file, or as complex as restructuring the
    1.42 +      entire hierarchy of files within the project.</para>
    1.43 +
    1.44 +    <para>Mercurial supports these kinds of complex changes fluently,
    1.45 +      provided we tell it what we're doing.  If we want to rename a
    1.46 +      file, we should use the <command>hg rename</command><footnote>
    1.47 +	<para>If you're a Unix user, you'll be glad to know that the
    1.48 +	  <command>hg rename</command> command can be abbreviated as
    1.49 +	  <command>hg mv</command>.</para>
    1.50 +      </footnote> command to rename it, so that Mercurial can do the
    1.51 +      right thing later when we merge.</para>
    1.52 +
    1.53 +    <para>We will cover the use of these commands in more detail in
    1.54 +      <xref linkend="chap:daily.copy"/>.</para>
    1.55    </sect1>
    1.56  </chapter>
    1.57