hgbook

diff en/00book.tex @ 103:5b80c922ebdd

find changesets by author, revision, files, or words in the commit message
More merge content.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu Oct 19 15:18:07 2006 -0700 (2006-10-19)
parents 2914e2373139
children 32bf9a5f22c0
line diff
     1.1 --- a/en/00book.tex	Thu Oct 12 12:20:35 2006 -0700
     1.2 +++ b/en/00book.tex	Thu Oct 19 15:18:07 2006 -0700
     1.3 @@ -38,7 +38,8 @@
     1.4  \include{preface}
     1.5  \include{intro}
     1.6  %\include{concepts}
     1.7 -\include{tour}
     1.8 +\include{tour-basic}
     1.9 +\include{tour-merge}
    1.10  \include{daily}
    1.11  \include{hook}
    1.12  \include{template}