hgbook
annotate ja/examples/backout.manual.merge.out @ 1098:f01108de23c3
2.7.1.2 zh translated
| author | Zhaoping Sun <zhaopingsun@gmail.com> |
|---|---|
| date | Tue Nov 24 21:59:43 2009 -0500 (2009-11-24) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{hg merge} |
| foozy@708 | 2 merging myfile |
| foozy@708 | 3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| foozy@708 | 4 (branch merge, don't forget to commit) |
| foozy@708 | 5 $ \textbf{hg commit -m 'merged backout with previous tip'} |
| foozy@708 | 6 $ \textbf{cat myfile} |
| foozy@708 | 7 first change |
| foozy@708 | 8 third change |