hgbook

annotate en/examples/tour.merge.merge.out @ 480:4e2ebef2c9a4

find changesets by author, revision, files, or words in the commit message
corrected some typos
author Javier Rojas <jerojasro@devnull.li>
date Sun Jan 04 23:04:06 2009 -0500 (2009-01-04)
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)