# HG changeset patch
# User Michael Rowe <mrowe@mojain.com>
# Date 1181131892 -36000
# Node ID d9d29e7cf5bd17b1a1ccdbfd5d9479f6df544cbe
# Parent  649a93bb45ae18fc9aedb302e220dbd87ccd0b63
fix a couple of over-zealous 'h' key typos

diff -r 649a93bb45ae -r d9d29e7cf5bd en/tour-merge.tex
--- 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.
 
diff -r 649a93bb45ae -r d9d29e7cf5bd en/undo.tex
--- 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''.