hgbook
annotate ja/examples/backout.manual.merge.out @ 897:e917517d1ef9
White background not needed for body if content is wrapped into .chapter.
| author | dukebody <dukebody@gmail.com> |
|---|---|
| date | Mon Oct 26 12:43:43 2009 +0100 (2009-10-26) |
| 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 |