Mercurial > hgbook

view ja/examples/tour.merge.merge.out @ 348:32d33b238b7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
made changes to the source files to be compiled at any rate.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Tue, 19 Aug 2008 16:03:33 +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)