hgbook

view en/examples/backout.manual.merge.out @ 289:7be02466421b

find changesets by author, revision, files, or words in the commit message
Oops, forgot to update the output
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Jan 18 12:05:01 2008 -0800 (2008-01-18)
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