hgbook
annotate en/examples/issue29.go.out @ 549:bc14f94e726a
Check in a known-broken example to fix up later - XXX
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu Jan 29 22:47:34 2009 -0800 (2009-01-29) |
parents | 91a936be78b8 |
children |
rev | line source |
---|---|
bos@156 | 1 $ \textbf{hg init issue29} |
bos@156 | 2 $ \textbf{cd issue29} |
bos@156 | 3 $ \textbf{echo a > a} |
bos@156 | 4 $ \textbf{hg ci -Ama} |
bos@156 | 5 adding a |
bos@156 | 6 $ \textbf{echo b > b} |
bos@156 | 7 $ \textbf{hg ci -Amb} |
bos@156 | 8 adding b |
bos@156 | 9 $ \textbf{hg up 0} |
bos@156 | 10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
bos@156 | 11 $ \textbf{mkdir b} |
bos@156 | 12 $ \textbf{echo b > b/b} |
bos@156 | 13 $ \textbf{hg ci -Amc} |
bos@156 | 14 adding b/b |
hg@295 | 15 created new head |
bos@156 | 16 $ \textbf{hg merge} |
bos@156 | 17 |