hgbook

view en/examples/tour.merge.merge.out @ 524:2228a02bb86b

find changesets by author, revision, files, or words in the commit message
corrected a typo, upgraded the section of unification of terms for translation
author Javier Rojas <jerojasro@devnull.li>
date Sun Jan 18 23:00:04 2009 -0500 (2009-01-18)
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)