1.1 --- a/en/tour-merge.tex	Wed Oct 18 12:06:56 2006 -0700
     1.2 +++ b/en/tour-merge.tex	Wed Oct 18 14:11:51 2006 -0700
     1.3 @@ -96,6 +96,11 @@
     1.4  our former heads as its parents.  These are the same revisions that
     1.5  were previously displayed by \hgcmd{parents}.
     1.6  \interaction{tour.merge.tip}
     1.7 +In figure~\ref{fig:tour-merge:merge}, you can see a representation of
     1.8 +what happens to the working directory during the merge, and how this
     1.9 +affects the repository when the commit happens.  During the merge, the
    1.10 +working directory has two parent changesets, and these become the
    1.11 +parents of the new changeset.
    1.12  
    1.13  %%% Local Variables: 
    1.14  %%% mode: latex