hgbook

view en/examples/backout.manual.merge.out @ 292:4aa900e1de2b

find changesets by author, revision, files, or words in the commit message
Fixed sample output for 'daily.copy' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 21:48:38 2008 +0200 (2008-08-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