hgbook

view en/examples/backout.manual.merge.out @ 265:d9a1faa45c30

find changesets by author, revision, files, or words in the commit message
added a space between -m and the commit message.
author bab@draketo.de
date Fri Aug 31 11:36:14 2007 +0200 (2007-08-31)
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