hgbook

annotate ja/examples/tour.merge.merge.out @ 1104:eafa27cb18eb

find changesets by author, revision, files, or words in the commit message
2.8.1 2 paras zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Wed Nov 25 22:54:30 2009 -0500 (2009-11-25)
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)