Mercurial > hgbook

view ja/examples/tour.merge.merge.out @ 785:7dd855842de4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more tour-basic.tex
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 06 Jun 2009 17:12:36 +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)