hgbook

view en/examples/backout.manual.merge.out @ 151:173e6eac4d5c

find changesets by author, revision, files, or words in the commit message
Fix "ul" and "dl" lists in HTML.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu Mar 08 23:35:23 2007 -0800 (2007-03-08)
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