hgbook

view en/examples/tour.merge.merge.out @ 436:0d6c97362064

find changesets by author, revision, files, or words in the commit message
translated cgi configuration
author Igor TAmara <igor@tamarapatino.org>
date Thu Dec 04 00:30:24 2008 -0500 (2008-12-04)
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)