annotate en/examples/backout.manual.merge.out @ 472:6880f9c8e7e7
Automated merge with http://mercurial.intuxication.org/hg/mercurial_book_es
| author |
Igor Támara <igor@tamarapatino.org> |
| date |
Sun Dec 28 00:30:26 2008 -0500 (2008-12-28) |
| 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
|
