hgbook

view en/examples/backout.manual.merge.out @ 379:dbc78b312fc0

find changesets by author, revision, files, or words in the commit message
finished translation of tour-basic
author Javier Rojas <jerojasro@devnull.li>
date Mon Oct 27 23:29:24 2008 -0500 (2008-10-27)
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