Mercurial > hgbook

view ja/examples/tour.merge.merge.out @ 837:b775f963b18c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up chapter 8, and add content propagate 7226e5e750a6
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Tue, 15 Sep 2009 22:32:03 +0900
parents b0db5adf11c1
children
line wrap: on
line source

$ \textbf{hg merge}
merging hello.c
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)