Mercurial > hgbook

view en/examples/tour.merge.merge.out @ 335:2a8c05da3fae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more mq.tex
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Mon, 31 Mar 2008 04:49:46 +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)