hgbook

view en/examples/tour.merge.merge.out @ 449:9b3cc9f398f9

find changesets by author, revision, files, or words in the commit message
Finished MQ chapter translation

Added translation term fold
author Igor TAmara <igor@tamarapatino.org>
date Sat Dec 13 12:23:51 2008 -0500 (2008-12-13)
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)