Mercurial > hgbook
view en/examples/tour.merge.merge.out @ 304:e87fe9497b27
add progress percentage to todo.txt
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Sat, 09 Feb 2008 00:23:15 +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)