annotate en/examples/backout.manual.merge.out @ 253:bdd271cf1ae1
Update expected output.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Wed May 30 22:05:35 2007 -0700 (2007-05-30) |
| parents |
006bbad1f190 |
| children |
|
| 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@179
|
7 first change
|
|
bos@144
|
8 third change
|
