hgbook

annotate ja/examples/tour.merge.merge.out @ 1087:48354eb7d1b0

find changesets by author, revision, files, or words in the commit message
　2.4.3 3para fuzzy
author Zhaoping Sun <zhaopingsun@gmail.com>
date Sun Nov 22 20:59:10 2009 -0500 (2009-11-22)
parents
children
rev   line source
foozy@708 1 $ \textbf{hg merge}
foozy@708 2 merging hello.c
foozy@708 3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
foozy@708 4 (branch merge, don't forget to commit)