hgbook

view en/examples/backout.manual.merge.out @ 171:8c1703a98266

find changesets by author, revision, files, or words in the commit message
Add a dependency on htlatex to HTML targets, even though we don't call it.
If the files it ships with aren't present, we can't build HTML.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Mar 26 23:57:58 2007 -0700 (2007-03-26)
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