hgbook
annotate en/examples/backout.manual.merge.out @ 144:006bbad1f190
Add expected output files.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Mar 06 21:44:56 2007 -0800 (2007-03-06) |
| parents | |
| children | 5fc4a45c069f |
| rev | line source |
|---|---|
| bos@144 | 1 $ \textbf{hg merge} |
| bos@144 | 2 merging myfile |
| bos@144 | 3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| bos@144 | 4 (branch merge, don't forget to commit) |
| bos@144 | 5 $ \textbf{hg commit -m 'merged backout with previous tip'} |
| bos@144 | 6 $ \textbf{cat myfile} |
| bos@144 | 7 third change |