hgbook

view ja/examples/tour.merge.merge.out @ 1086:8ce6c7a3ebd2

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