Mercurial > hgbook
changeset 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 | 649a93bb45ae |
| children | 1a55ba6ceca1 |
| files | en/tour-merge.tex en/undo.tex |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/en/tour-merge.tex Sun Jun 03 09:49:14 2007 -0700 +++ b/en/tour-merge.tex Wed Jun 06 22:11:32 2007 +1000 @@ -180,7 +180,7 @@ \end{figure} For each conflicting portion of the file, we can choose to resolve -thhe conflict using some combination of text from the base version, +the conflict using some combination of text from the base version, ours, or theirs. We can also manually edit the merged file at any time, in case we need to make further modifications.
--- a/en/undo.tex Sun Jun 03 09:49:14 2007 -0700 +++ b/en/undo.tex Wed Jun 06 22:11:32 2007 +1000 @@ -753,7 +753,7 @@ Choosing the first ``good'' and ``bad'' changesets that will mark the end points of your search is often easy, but it bears a little -discussion neverthheless. From the perspective of \hgext{bisect}, the +discussion nevertheless. From the perspective of \hgext{bisect}, the ``newest'' changeset is conventionally ``bad'', and the older changeset is ``good''.