Mercurial > hgbook

view ja/examples/tour.merge.merge.out @ 836:d819bc2414f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add figs/bad-merge-*.dot. a part of 7226e5e750a6.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 23 Jul 2009 18:10:58 +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)