Mercurial > hgbook

view en/examples/backout.manual.merge.out @ 208:a239cd51dcd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Note "branches" keyword for templates.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 25 Apr 2007 11:04:36 -0700
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