hgbook

view en/examples/tour.merge.merge.out @ 313:a168daed199b

find changesets by author, revision, files, or words in the commit message
Fix typos
author Simon Ruderich <simon@ruderich.org>
date Tue Aug 26 13:55:04 2008 -0700 (2008-08-26)
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)