hgbook

view en/examples/backout.manual.merge.out @ 948:afdc168fa06c

find changesets by author, revision, files, or words in the commit message
Merge from Hugues and my work
author Romain PELISSE <belaran@gmail.com>
date Mon Feb 16 23:31:14 2009 +0100 (2009-02-16)
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