hgbook

view en/examples/tour.merge.merge.out @ 295:43bfadf9b760

find changesets by author, revision, files, or words in the commit message
Fixed sample output for 'issue29' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 21:50:17 2008 +0200 (2008-08-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)