hgbook

view en/examples/tour.merge.merge.out @ 956:61f7bf2e562d

find changesets by author, revision, files, or words in the commit message
review of french tour-basic
author Wilk
date Sun Feb 22 16:15:40 2009 +0100 (2009-02-22)
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)