hgbook

diff en/examples/auto-snippets.xml @ 674:3b640272a966

find changesets by author, revision, files, or words in the commit message
Progres on resolve
author Bryan O'Sullivan <bos@serpentine.com>
date Sun Apr 12 00:05:30 2009 -0700 (2009-04-12)
parents 3b33dd6aba87
children ef53d025f410
line diff
     1.1 --- a/en/examples/auto-snippets.xml	Thu Apr 02 09:24:36 2009 +0800
     1.2 +++ b/en/examples/auto-snippets.xml	Sun Apr 12 00:05:30 2009 -0700
     1.3 @@ -51,6 +51,15 @@
     1.4  <!ENTITY interaction.branching.stable SYSTEM "results/branching.stable.lxo">
     1.5  <!ENTITY interaction.branching.tag SYSTEM "results/branching.tag.lxo">
     1.6  <!ENTITY interaction.branching.update SYSTEM "results/branching.update.lxo">
     1.7 +<!ENTITY interaction.ch04-resolve.cifail SYSTEM "results/ch04-resolve.cifail.lxo">
     1.8 +<!ENTITY interaction.ch04-resolve.export SYSTEM "results/ch04-resolve.export.lxo">
     1.9 +<!ENTITY interaction.ch04-resolve.heads SYSTEM "results/ch04-resolve.heads.lxo">
    1.10 +<!ENTITY interaction.ch04-resolve.init SYSTEM "results/ch04-resolve.init.lxo">
    1.11 +<!ENTITY interaction.ch04-resolve.left SYSTEM "results/ch04-resolve.left.lxo">
    1.12 +<!ENTITY interaction.ch04-resolve.list SYSTEM "results/ch04-resolve.list.lxo">
    1.13 +<!ENTITY interaction.ch04-resolve.merge SYSTEM "results/ch04-resolve.merge.lxo">
    1.14 +<!ENTITY interaction.ch04-resolve.pull SYSTEM "results/ch04-resolve.pull.lxo">
    1.15 +<!ENTITY interaction.ch04-resolve.right SYSTEM "results/ch04-resolve.right.lxo">
    1.16  <!ENTITY interaction.cmdref.diff-p SYSTEM "results/cmdref.diff-p.lxo">
    1.17  <!ENTITY interaction.daily.copy.after SYSTEM "results/daily.copy.after.lxo">
    1.18  <!ENTITY interaction.daily.copy.cat SYSTEM "results/daily.copy.cat.lxo">