Mercurial > hgbook
annotate en/examples/tour.merge.merge.out @ 155:914babdc99c8
run-example: better error if bogus section name found.
Fix all such bogus names in sources.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 12 Mar 2007 23:10:32 -0700 |
parents | 006bbad1f190 |
children |
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) |