Mercurial > hgbook
comparison en/tour-merge.tex @ 257:d9d29e7cf5bd
fix a couple of over-zealous 'h' key typos
| author | Michael Rowe <mrowe@mojain.com> |
|---|---|
| date | Wed, 06 Jun 2007 22:11:32 +1000 |
| parents | 34943a3d50d6 |
| children | 1a4b507935de |
comparison
equal
deleted
inserted
replaced
| 256:649a93bb45ae | 257:d9d29e7cf5bd |
|---|---|
| 178 \caption{Using \command{kdiff3} to merge versions of a file} | 178 \caption{Using \command{kdiff3} to merge versions of a file} |
| 179 \label{fig:tour-merge:kdiff3} | 179 \label{fig:tour-merge:kdiff3} |
| 180 \end{figure} | 180 \end{figure} |
| 181 | 181 |
| 182 For each conflicting portion of the file, we can choose to resolve | 182 For each conflicting portion of the file, we can choose to resolve |
| 183 thhe conflict using some combination of text from the base version, | 183 the conflict using some combination of text from the base version, |
| 184 ours, or theirs. We can also manually edit the merged file at any | 184 ours, or theirs. We can also manually edit the merged file at any |
| 185 time, in case we need to make further modifications. | 185 time, in case we need to make further modifications. |
| 186 | 186 |
| 187 There are \emph{many} file merging tools available, too many to cover | 187 There are \emph{many} file merging tools available, too many to cover |
| 188 here. They vary in which platforms they are available for, and in | 188 here. They vary in which platforms they are available for, and in |