Mercurial > hgbook

annotate en/examples/tour.merge.merge.out @ 173:754312dc23d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If something times out, try to tell what it was.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 27 Mar 2007 15:45:12 -0700
parents 006bbad1f190
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{hg merge}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 merging hello.c
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 (branch merge, don't forget to commit)