hgbook

annotate en/examples/tour.merge.merge.out @ 416:15bf7d50b586

find changesets by author, revision, files, or words in the commit message
Translated a couple of paragraphs
author jerojasro@devnull.li
date Wed Nov 12 22:36:35 2008 -0500 (2008-11-12)
parents
children
rev   line source
bos@144 1 $ \textbf{hg merge}
bos@144 2 merging hello.c
bos@144 3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
bos@144 4 (branch merge, don't forget to commit)