comparison en/examples/auto-snippets.xml @ 714:c44d5854620b

Fix up chapter 1.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 31 Mar 2009 22:38:30 -0700
parents a2923aa93da9
children 3b33dd6aba87
comparison
equal deleted inserted replaced
707:c17f8bffc9e5 714:c44d5854620b
178 <!ENTITY interaction.tour-merge-conflict.cousin SYSTEM "results/tour-merge-conflict.cousin.lxo"> 178 <!ENTITY interaction.tour-merge-conflict.cousin SYSTEM "results/tour-merge-conflict.cousin.lxo">
179 <!ENTITY interaction.tour-merge-conflict.merge SYSTEM "results/tour-merge-conflict.merge.lxo"> 179 <!ENTITY interaction.tour-merge-conflict.merge SYSTEM "results/tour-merge-conflict.merge.lxo">
180 <!ENTITY interaction.tour-merge-conflict.pull SYSTEM "results/tour-merge-conflict.pull.lxo"> 180 <!ENTITY interaction.tour-merge-conflict.pull SYSTEM "results/tour-merge-conflict.pull.lxo">
181 <!ENTITY interaction.tour-merge-conflict.son SYSTEM "results/tour-merge-conflict.son.lxo"> 181 <!ENTITY interaction.tour-merge-conflict.son SYSTEM "results/tour-merge-conflict.son.lxo">
182 <!ENTITY interaction.tour-merge-conflict.wife SYSTEM "results/tour-merge-conflict.wife.lxo"> 182 <!ENTITY interaction.tour-merge-conflict.wife SYSTEM "results/tour-merge-conflict.wife.lxo">
183 <!ENTITY interaction.tour.cat1 SYSTEM "results/tour.cat1.lxo">
184 <!ENTITY interaction.tour.cat2 SYSTEM "results/tour.cat2.lxo">
183 <!ENTITY interaction.tour.clone SYSTEM "results/tour.clone.lxo"> 185 <!ENTITY interaction.tour.clone SYSTEM "results/tour.clone.lxo">
184 <!ENTITY interaction.tour.clone-pull SYSTEM "results/tour.clone-pull.lxo"> 186 <!ENTITY interaction.tour.clone-pull SYSTEM "results/tour.clone-pull.lxo">
185 <!ENTITY interaction.tour.clone-push SYSTEM "results/tour.clone-push.lxo"> 187 <!ENTITY interaction.tour.clone-push SYSTEM "results/tour.clone-push.lxo">
186 <!ENTITY interaction.tour.commit SYSTEM "results/tour.commit.lxo"> 188 <!ENTITY interaction.tour.commit SYSTEM "results/tour.commit.lxo">
187 <!ENTITY interaction.tour.diff SYSTEM "results/tour.diff.lxo"> 189 <!ENTITY interaction.tour.diff SYSTEM "results/tour.diff.lxo">