hgbook
view en/examples/issue29.go.out @ 356:0db175abfaf3
some friggin' merge or something like that.
| author | jerojasro@localhost |
|---|---|
| date | Tue Oct 21 22:41:51 2008 -0500 (2008-10-21) |
| parents | 91a936be78b8 |
| 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 created new head
16 $ \textbf{hg merge}