hgbook

view en/examples/backout.manual.merge.out @ 465:aa6036a9688e

find changesets by author, revision, files, or words in the commit message
translated up to almost the end of the "integration with bugzilla" section. upgraded project status
author Javier Rojas <jerojasro@devnull.li>
date Wed Dec 24 08:06:54 2008 -0500 (2008-12-24)
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