hgbook

annotate 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
rev   line source
foozy@708 1 $ \textbf{hg init issue29}
foozy@708 2 $ \textbf{cd issue29}
foozy@708 3 $ \textbf{echo a > a}
foozy@708 4 $ \textbf{hg ci -Ama}
foozy@708 5 adding a
foozy@708 6 $ \textbf{echo b > b}
foozy@708 7 $ \textbf{hg ci -Amb}
foozy@708 8 adding b
foozy@708 9 $ \textbf{hg up 0}
foozy@708 10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
foozy@708 11 $ \textbf{mkdir b}
foozy@708 12 $ \textbf{echo b > b/b}
foozy@708 13 $ \textbf{hg ci -Amc}
foozy@708 14 adding b/b
foozy@708 15 $ \textbf{hg merge}
foozy@708 16