hgbook

view en/examples/tour.merge.merge.out @ 411:006cd2b41d11

find changesets by author, revision, files, or words in the commit message
corrected translation of a term
author Javier Rojas <jerojasro@devnull.li>
date Mon Nov 10 22:20:46 2008 -0500 (2008-11-10)
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)