Mercurial > hgbook
comparison en/00book.xml @ 749:7e7c47481e4f
Oops, this is the real merge for my hg's oddity
| author | Dongsheng Song <dongsheng.song@gmail.com> |
|---|---|
| date | Fri, 20 Mar 2009 16:43:35 +0800 |
| parents | cfdb601a3c8b |
| children | 751ee9bf2e8d |
comparison
equal
deleted
inserted
replaced
| 748:d13c7c706a58 | 749:7e7c47481e4f |
|---|---|
| 5 [ | 5 [ |
| 6 <!-- Below are references to files in this directory. --> | 6 <!-- Below are references to files in this directory. --> |
| 7 | 7 |
| 8 <!-- Chapters. --> | 8 <!-- Chapters. --> |
| 9 | 9 |
| 10 <!ENTITY ch01 SYSTEM "ch01-intro.xml"> | 10 <!ENTITY ch00 SYSTEM "ch00-preface.xml"> |
| 11 <!ENTITY ch02 SYSTEM "ch02-tour-basic.xml"> | 11 <!ENTITY ch01 SYSTEM "ch01-tour-basic.xml"> |
| 12 <!ENTITY ch03 SYSTEM "ch03-tour-merge.xml"> | 12 <!ENTITY ch02 SYSTEM "ch02-tour-merge.xml"> |
| 13 <!ENTITY ch04 SYSTEM "ch04-concepts.xml"> | 13 <!ENTITY ch03 SYSTEM "ch03-concepts.xml"> |
| 14 <!ENTITY ch05 SYSTEM "ch05-daily.xml"> | 14 <!ENTITY ch04 SYSTEM "ch04-daily.xml"> |
| 15 <!ENTITY ch06 SYSTEM "ch06-collab.xml"> | 15 <!ENTITY ch05 SYSTEM "ch05-collab.xml"> |
| 16 <!ENTITY ch07 SYSTEM "ch07-filenames.xml"> | 16 <!ENTITY ch06 SYSTEM "ch06-filenames.xml"> |
| 17 <!ENTITY ch08 SYSTEM "ch08-branch.xml"> | 17 <!ENTITY ch07 SYSTEM "ch07-branch.xml"> |
| 18 <!ENTITY ch09 SYSTEM "ch09-undo.xml"> | 18 <!ENTITY ch08 SYSTEM "ch08-undo.xml"> |
| 19 <!ENTITY ch10 SYSTEM "ch10-hook.xml"> | 19 <!ENTITY ch09 SYSTEM "ch09-hook.xml"> |
| 20 <!ENTITY ch11 SYSTEM "ch11-template.xml"> | 20 <!ENTITY ch10 SYSTEM "ch10-template.xml"> |
| 21 <!ENTITY ch12 SYSTEM "ch12-mq.xml"> | 21 <!ENTITY ch11 SYSTEM "ch11-mq.xml"> |
| 22 <!ENTITY ch13 SYSTEM "ch13-mq-collab.xml"> | 22 <!ENTITY ch12 SYSTEM "ch12-mq-collab.xml"> |
| 23 <!ENTITY ch14 SYSTEM "ch14-hgext.xml"> | 23 <!ENTITY ch13 SYSTEM "ch13-hgext.xml"> |
| 24 <!ENTITY appA SYSTEM "appA-cmdref.xml"> | 24 <!ENTITY appA SYSTEM "appA-cmdref.xml"> |
| 25 <!ENTITY appB SYSTEM "appB-mq-ref.xml"> | 25 <!ENTITY appB SYSTEM "appB-mq-ref.xml"> |
| 26 <!ENTITY appC SYSTEM "appC-srcinstall.xml"> | 26 <!ENTITY appC SYSTEM "appC-srcinstall.xml"> |
| 27 <!ENTITY appD SYSTEM "appD-license.xml"> | 27 <!ENTITY appD SYSTEM "appD-license.xml"> |
| 28 | 28 |
| 77 &ch09; | 77 &ch09; |
| 78 &ch10; | 78 &ch10; |
| 79 &ch11; | 79 &ch11; |
| 80 &ch12; | 80 &ch12; |
| 81 &ch13; | 81 &ch13; |
| 82 &ch14; | |
| 83 <!-- &appA; --> | 82 <!-- &appA; --> |
| 84 &appB; | 83 &appB; |
| 85 &appC; | 84 &appC; |
| 86 &appD; | 85 &appD; |
| 87 </book> | 86 </book> |