hgbook
diff en/mq.tex @ 959:b3cb66d935cf
Finished tour-merge.tex
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Mon Feb 23 23:53:18 2009 +0100 (2009-02-23) |
parents | 53e20c92b6b6 |
children |
line diff
1.1 --- a/en/mq.tex Tue Aug 26 18:58:20 2008 +0200 1.2 +++ b/en/mq.tex Mon Feb 23 23:53:18 2009 +0100 1.3 @@ -525,7 +525,7 @@ 1.4 modifies \filename{foo} with six hunks, and one of them fails to 1.5 apply, you will have: an unmodified \filename{foo.orig}, a 1.6 \filename{foo.rej} containing one hunk, and \filename{foo}, containing 1.7 -the changes made by the five successful five hunks. 1.8 +the changes made by the five successful hunks. 1.9 1.10 \subsection{Some quirks of patch representation} 1.11