hgbook
annotate en/examples/issue29.go.out @ 178:1b55292716a4
correct single typo in chpt 5 text
author | Steve Guidon <steve.guidon@gmail.com> |
---|---|
date | Thu Mar 29 19:55:18 2007 +0100 (2007-03-29) |
parents | |
children | 43bfadf9b760 |
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 |
bos@156 | 15 $ \textbf{hg merge} |
bos@156 | 16 |