hgbook

view ja/examples/tour.merge.merge.out @ 862:ad6d3f5245e7

find changesets by author, revision, files, or words in the commit message
Link back to the original English version of the book.
author gpiancastelli
date Fri Aug 28 12:21:45 2009 +0200 (2009-08-28)
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)