1.1 --- a/en/tour-merge.tex	Mon Oct 16 14:54:37 2006 -0700
     1.2 +++ b/en/tour-merge.tex	Wed Oct 18 12:06:56 2006 -0700
     1.3 @@ -72,12 +72,22 @@
     1.4  update to the new tip?
     1.5  \interaction{tour.merge.update}
     1.6  Mercurial is telling us that the \hgcmd{update} command won't do a
     1.7 -merge.  Instead, we use the \hgcmd{merge} command to merge the two
     1.8 -heads.
     1.9 +merge; it won't update the working directory when it thinks we might
    1.10 +be wanting to do a merge, unless we force it to do so.  Instead, we
    1.11 +use the \hgcmd{merge} command to merge the two heads.
    1.12  \interaction{tour.merge.merge}
    1.13 +
    1.14 +\begin{figure}[ht]
    1.15 +  \centering
    1.16 +  \grafix{tour-merge-merge}
    1.17 +  \caption{Working directory and repository during merge, and
    1.18 +    following commit}
    1.19 +  \label{fig:tour-merge:merge}
    1.20 +\end{figure}
    1.21 +
    1.22  This updates the working directory so that it contains changes from
    1.23 -both heads, which is reflected in both the output of \hgcmd{parents}
    1.24 -and the contents of \filename{hello.c}.
    1.25 +\emph{both} heads, which is reflected in both the output of
    1.26 +\hgcmd{parents} and the contents of \filename{hello.c}.
    1.27  \interaction{tour.merge.parents}
    1.28  Whenever we've done a merge, \hgcmd{parents} will display two parents
    1.29  until we \hgcmd{commit} the results of the merge.