hgbook

annotate en/examples/tour.merge.merge.out @ 272:74c079e0051f

find changesets by author, revision, files, or words in the commit message
Account for change in bisect output.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Nov 26 11:18:46 2007 -0800 (2007-11-26)
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)