hgbook

annotate ja/examples/tour.merge.merge.out @ 1099:a1b3a1de1038

find changesets by author, revision, files, or words in the commit message
2.7.2 zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Tue Nov 24 22:16:48 2009 -0500 (2009-11-24)
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)