hgbook

view en/examples/backout.manual.merge.out @ 495:dfa2890d9b30

find changesets by author, revision, files, or words in the commit message
translated most of section 13.8
author Javier Rojas <jerojasro@devnull.li>
date Wed Jan 07 23:38:40 2009 -0500 (2009-01-07)
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