hgbook

view ja/examples/backout.manual.merge.out @ 1039:d0870e907b3d

find changesets by author, revision, files, or words in the commit message
1.5 partly translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Sun Nov 08 17:25:59 2009 -0500 (2009-11-08)
parents
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