Mercurial > hgbook

view ja/examples/backout.manual.merge.out @ 800:1a30d2627512

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Propagate 2ff0a43f1152 Update ch03
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 18 Jun 2009 20:04:44 +0900
parents b0db5adf11c1
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