annotate en/examples/backout.manual.merge.out @ 292:4aa900e1de2b
Fixed sample output for 'daily.copy' test.
| author |
Guido Ostkamp <hg@ostkamp.fastmail.fm> |
| date |
Wed Aug 20 21:48:38 2008 +0200 (2008-08-20) |
| 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
|
