Mercurial > hgbook

view en/examples/results/tour.merge.merge.out @ 662:44d1363234d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move example output files into examples/results
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 21:37:47 -0700
parents en/examples/tour.merge.merge.out@006bbad1f190
children 0d5935744f87
line wrap: on
line source

$ \textbf{hg merge}
merging hello.c
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)