Mercurial > hgbook
comparison en/examples/auto-snippets.xml @ 773:3b640272a966
Progres on resolve
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sun, 12 Apr 2009 00:05:30 -0700 |
parents | 3b33dd6aba87 |
children | ef53d025f410 |
comparison
equal
deleted
inserted
replaced
772:dbe5f4bb6507 | 773:3b640272a966 |
---|---|
49 <!ENTITY interaction.branching.main SYSTEM "results/branching.main.lxo"> | 49 <!ENTITY interaction.branching.main SYSTEM "results/branching.main.lxo"> |
50 <!ENTITY interaction.branching.merge SYSTEM "results/branching.merge.lxo"> | 50 <!ENTITY interaction.branching.merge SYSTEM "results/branching.merge.lxo"> |
51 <!ENTITY interaction.branching.stable SYSTEM "results/branching.stable.lxo"> | 51 <!ENTITY interaction.branching.stable SYSTEM "results/branching.stable.lxo"> |
52 <!ENTITY interaction.branching.tag SYSTEM "results/branching.tag.lxo"> | 52 <!ENTITY interaction.branching.tag SYSTEM "results/branching.tag.lxo"> |
53 <!ENTITY interaction.branching.update SYSTEM "results/branching.update.lxo"> | 53 <!ENTITY interaction.branching.update SYSTEM "results/branching.update.lxo"> |
54 <!ENTITY interaction.ch04-resolve.cifail SYSTEM "results/ch04-resolve.cifail.lxo"> | |
55 <!ENTITY interaction.ch04-resolve.export SYSTEM "results/ch04-resolve.export.lxo"> | |
56 <!ENTITY interaction.ch04-resolve.heads SYSTEM "results/ch04-resolve.heads.lxo"> | |
57 <!ENTITY interaction.ch04-resolve.init SYSTEM "results/ch04-resolve.init.lxo"> | |
58 <!ENTITY interaction.ch04-resolve.left SYSTEM "results/ch04-resolve.left.lxo"> | |
59 <!ENTITY interaction.ch04-resolve.list SYSTEM "results/ch04-resolve.list.lxo"> | |
60 <!ENTITY interaction.ch04-resolve.merge SYSTEM "results/ch04-resolve.merge.lxo"> | |
61 <!ENTITY interaction.ch04-resolve.pull SYSTEM "results/ch04-resolve.pull.lxo"> | |
62 <!ENTITY interaction.ch04-resolve.right SYSTEM "results/ch04-resolve.right.lxo"> | |
54 <!ENTITY interaction.cmdref.diff-p SYSTEM "results/cmdref.diff-p.lxo"> | 63 <!ENTITY interaction.cmdref.diff-p SYSTEM "results/cmdref.diff-p.lxo"> |
55 <!ENTITY interaction.daily.copy.after SYSTEM "results/daily.copy.after.lxo"> | 64 <!ENTITY interaction.daily.copy.after SYSTEM "results/daily.copy.after.lxo"> |
56 <!ENTITY interaction.daily.copy.cat SYSTEM "results/daily.copy.cat.lxo"> | 65 <!ENTITY interaction.daily.copy.cat SYSTEM "results/daily.copy.cat.lxo"> |
57 <!ENTITY interaction.daily.copy.clone SYSTEM "results/daily.copy.clone.lxo"> | 66 <!ENTITY interaction.daily.copy.clone SYSTEM "results/daily.copy.clone.lxo"> |
58 <!ENTITY interaction.daily.copy.copy SYSTEM "results/daily.copy.copy.lxo"> | 67 <!ENTITY interaction.daily.copy.copy SYSTEM "results/daily.copy.copy.lxo"> |