Mercurial > hgbook
diff en/examples/auto-snippets.xml @ 766:3b33dd6aba87
Merge with http://hg.serpentine.com/mercurial/book
| author | Dongsheng Song <songdongsheng@live.cn> |
|---|---|
| date | Thu, 02 Apr 2009 09:24:36 +0800 |
| parents | 1c13ed2130a7 c44d5854620b |
| children | 3b640272a966 |
line wrap: on
line diff
--- a/en/examples/auto-snippets.xml Tue Mar 31 21:17:59 2009 +0800 +++ b/en/examples/auto-snippets.xml Thu Apr 02 09:24:36 2009 +0800 @@ -180,6 +180,8 @@ <!ENTITY interaction.tour-merge-conflict.pull SYSTEM "results/tour-merge-conflict.pull.lxo"> <!ENTITY interaction.tour-merge-conflict.son SYSTEM "results/tour-merge-conflict.son.lxo"> <!ENTITY interaction.tour-merge-conflict.wife SYSTEM "results/tour-merge-conflict.wife.lxo"> +<!ENTITY interaction.tour.cat1 SYSTEM "results/tour.cat1.lxo"> +<!ENTITY interaction.tour.cat2 SYSTEM "results/tour.cat2.lxo"> <!ENTITY interaction.tour.clone SYSTEM "results/tour.clone.lxo"> <!ENTITY interaction.tour.clone-pull SYSTEM "results/tour.clone-pull.lxo"> <!ENTITY interaction.tour.clone-push SYSTEM "results/tour.clone-push.lxo">