hgbook

view en/examples/tour.merge.merge.out @ 268:ca475a9e2e59

find changesets by author, revision, files, or words in the commit message
Fix modified example.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Aug 31 12:48:44 2007 -0700 (2007-08-31)
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)