hgbook

view en/examples/backout.manual.merge.out @ 472:6880f9c8e7e7

find changesets by author, revision, files, or words in the commit message
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
line source
1 $ \textbf{hg merge}
2 merging myfile
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
4 (branch merge, don't forget to commit)
5 $ \textbf{hg commit -m 'merged backout with previous tip'}
6 $ \textbf{cat myfile}
7 first change
8 third change