hgbook

view en/examples/backout.manual.merge.out @ 273:00f69e8825c5

find changesets by author, revision, files, or words in the commit message
Bring book up to date with recent changes.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Nov 26 12:24:53 2007 -0800 (2007-11-26)
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