Mercurial > hgbook
comparison en/ch03-tour-merge.tex @ 650:f72b7e6cbe90
Snapshot.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu, 05 Feb 2009 00:01:16 -0800 |
| parents | 5cd47f721686 |
| children |
comparison
equal
deleted
inserted
replaced
| 649:5cd47f721686 | 650:f72b7e6cbe90 |
|---|---|
| 83 \interaction{tour.merge.merge} | 83 \interaction{tour.merge.merge} |
| 84 | 84 |
| 85 \begin{figure}[ht] | 85 \begin{figure}[ht] |
| 86 \centering | 86 \centering |
| 87 \grafix{tour-merge-merge} | 87 \grafix{tour-merge-merge} |
| 88 \caption{Working directory and repository during merge, and | 88 \caption{Working directory and repository during merge, and following commit} |
| 89 following commit} | |
| 90 \label{fig:tour-merge:merge} | 89 \label{fig:tour-merge:merge} |
| 91 \end{figure} | 90 \end{figure} |
| 92 | 91 |
| 93 This updates the working directory so that it contains changes from | 92 This updates the working directory so that it contains changes from |
| 94 \emph{both} heads, which is reflected in both the output of | 93 \emph{both} heads, which is reflected in both the output of |