hgbook

view en/examples/tour.merge.merge.out @ 491:795f2964e104

find changesets by author, revision, files, or words in the commit message
translated section 13.4
author Javier Rojas <jerojasro@devnull.li>
date Wed Jan 07 22:26:07 2009 -0500 (2009-01-07)
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)