hgbook

view en/examples/tour.merge.merge.out @ 457:6ad83df399b7

find changesets by author, revision, files, or words in the commit message
corrected a problem that was breaking teh build
author Javier Rojas <jerojasro@devnull.li>
date Sun Dec 21 12:01:08 2008 -0500 (2008-12-21)
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)