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

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.parents -->
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 parents</userinput>
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 changeset:
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
4 user: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 summary: A new hello for a new day.
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 changeset:
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 tag: tip
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 parent:
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
11 user: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 summary: Added an extra line of output
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
15 <prompt>$</prompt> <userinput>cat hello.c</userinput>
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16 /*
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
17 * Placed in the public domain by Bryan O'Sullivan. This program is
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
18 * not covered by patents in the United States or other countries.
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
19 */
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
20
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
21 #include &lt;stdio.h&gt;
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
22
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
23 int main(int argc, char **argv)
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
24 {
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
25 printf("once more, hello.\n");
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
26 printf("hello, world!\");
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
27 printf("hello again!\n");
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
28 return 0;
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
29 }
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
30 </screen>
709
4432ad34b8e5 Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents: 663
diff changeset
31 <!-- END tour.merge.parents -->