hgbook

view ja/examples/tour.merge.merge.out @ 1109:e1ca493f011d

find changesets by author, revision, files, or words in the commit message
2.8.4 first 2 para zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Wed Dec 23 23:29:17 2009 -0500 (2009-12-23)
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)