Mercurial > hgbook

view en/examples/tour.merge.merge.out @ 353:89a903605c74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more mq-collab.tex
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Tue, 19 Aug 2008 19:32:28 +0900
parents 006bbad1f190
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)