Mercurial > hgbook

view en/examples/backout.manual.merge.out @ 548:9b3cc9f398f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Finished MQ chapter translation Added translation term fold
author Igor TAmara <igor@tamarapatino.org>
date Sat, 13 Dec 2008 12:23:51 -0500
parents 5fc4a45c069f
children
line wrap: on
line source

$ \textbf{hg merge}
merging myfile
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ \textbf{hg commit -m 'merged backout with previous tip'}
$ \textbf{cat myfile}
first change
third change