Mercurial > hgbook
view en/examples/tour.merge.merge.out @ 333:db3aa48f2f73
more mq.tex
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Sun, 30 Mar 2008 17:46:24 +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)