hgbook

annotate en/examples/tour.merge.merge.out @ 276:92660e72d6bf

find changesets by author, revision, files, or words in the commit message
[hgbook] Fix a typo
author "Dongsheng Song" <dongsheng.song@gmail.com>
date Fri Dec 07 21:25:07 2007 -0800 (2007-12-07)
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)