hgbook

view ja/examples/tour.merge.merge.out @ 872:102f89d20be1

find changesets by author, revision, files, or words in the commit message
remove spurious 'hg' from mq command line options
author Steve Borho <steve@borho.org>
date Tue Oct 27 22:46:49 2009 -0500 (2009-10-27)
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)