hgbook

view ja/examples/issue29.go.out @ 862:ad6d3f5245e7

Link back to the original English version of the book.
author gpiancastelli
date Fri Aug 28 12:21:45 2009 +0200 (2009-08-28)
parents
children
line source
1 $ \textbf{hg init issue29}
2 $ \textbf{cd issue29}
3 $ \textbf{echo a > a}
4 $ \textbf{hg ci -Ama}
5 adding a
6 $ \textbf{echo b > b}
7 $ \textbf{hg ci -Amb}
8 adding b
9 $ \textbf{hg up 0}
10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
11 $ \textbf{mkdir b}
12 $ \textbf{echo b > b/b}
13 $ \textbf{hg ci -Amc}
14 adding b/b
15 $ \textbf{hg merge}