hgbook

view en/examples/backout.manual.merge.out @ 202:6f167e644762

find changesets by author, revision, files, or words in the commit message
Start writing about named branches.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Apr 20 14:02:10 2007 -0700 (2007-04-20)
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