Mercurial > hgbook

view en/examples/backout.manual.merge.out @ 156:91a936be78b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Document merge behaviour with file names.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 12 Mar 2007 23:11:26 -0700
parents 006bbad1f190
children 5fc4a45c069f
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}
third change