annotate en/examples/backout.manual.merge.out @ 177:c54f4c106fd5
Record the version of Mercurial used.
author |
Bryan O'Sullivan <bos@serpentine.com> |
date |
Wed Mar 28 23:01:57 2007 -0700 (2007-03-28) |
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
|