hgbook

annotate en/examples/tour.merge.merge.out @ 300:b0d1aec44945

find changesets by author, revision, files, or words in the commit message
Fix sample output for test 'tag'.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 21:56:16 2008 +0200 (2008-08-20)
parents
children
rev   line source
bos@144 1 $ \textbf{hg merge}
bos@144 2 merging hello.c
bos@144 3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
bos@144 4 (branch merge, don't forget to commit)