hgbook

view ja/examples/backout.manual.merge.out @ 914:a9e6eca8bfc5

find changesets by author, revision, files, or words in the commit message
Adjust the footer style.
author dukebody <dukebody@gmail.com>
date Tue Oct 27 00:32:34 2009 +0100 (2009-10-27)
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