hgbook: eca3a16c0114 ja/examples/issue29.go.out

hgbook

Merge with dongsheng

author	Bryan O'Sullivan <bos@serpentine.com>
date	Fri Aug 14 12:12:19 2009 -0700 (2009-08-14)
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}