hgbook

view en/examples/backout.manual.merge.out @ 176:edd2acc3dbab

find changesets by author, revision, files, or words in the commit message
Fix build bogon.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed Mar 28 22:55:13 2007 -0700 (2007-03-28)
parents
children 5fc4a45c069f
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 third change