hgbook

view ja/examples/tour.merge.merge.out @ 1090:3c3a2bd7c14e

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