hgbook

view en/examples/tour.merge.merge.out @ 949:233537f6a12c

find changesets by author, revision, files, or words in the commit message
Removing useless carriage return and double entry in the menu
author Romain PELISSE <belaran@gmail.com>
date Mon Feb 16 23:40:10 2009 +0100 (2009-02-16)
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)