Mercurial > hgbook

view ja/examples/tour.merge.merge.out @ 838:d1f676a6a4b3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update mq chapter. propagate ef53d025f410.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 03 Dec 2009 01:26:08 +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)