Mercurial > hgbook

annotate en/examples/results/tour.merge.merge.out @ 709:4432ad34b8e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check in example outputs with begin/end markers.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 31 Mar 2009 12:19:01 -0700
parents 0d5935744f87
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
709
4432ad34b8e5 Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents: 663
diff changeset
1 <!-- BEGIN tour.merge.merge -->
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
2 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 merging hello.c
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 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
5 (branch merge, don't forget to commit)
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
6 </screen>
709
4432ad34b8e5 Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents: 663
diff changeset
7 <!-- END tour.merge.merge -->