hgbook
annotate en/examples/results/tour.merge.parents.out @ 611:4432ad34b8e5
Check in example outputs with begin/end markers.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Mar 31 12:19:01 2009 -0700 (2009-03-31) |
| parents | 0d5935744f87 |
| children |
| rev | line source |
|---|---|
| bos@611 | 1 <!-- BEGIN tour.merge.parents --> |
| bos@564 | 2 <screen><prompt>$</prompt> <userinput>hg parents</userinput> |
| bos@144 | 3 changeset: |
| bos@564 | 4 user: Bryan O'Sullivan <bos@serpentine.com> |
| bos@144 | 5 |
| bos@144 | 6 summary: A new hello for a new day. |
| bos@144 | 7 |
| bos@144 | 8 changeset: |
| bos@144 | 9 tag: tip |
| bos@144 | 10 parent: |
| bos@564 | 11 user: Bryan O'Sullivan <bos@serpentine.com> |
| bos@144 | 12 |
| bos@144 | 13 summary: Added an extra line of output |
| bos@144 | 14 |
| bos@564 | 15 <prompt>$</prompt> <userinput>cat hello.c</userinput> |
| bos@144 | 16 /* |
| bos@144 | 17 * Placed in the public domain by Bryan O'Sullivan. This program is |
| bos@144 | 18 * not covered by patents in the United States or other countries. |
| bos@144 | 19 */ |
| bos@144 | 20 |
| bos@564 | 21 #include <stdio.h> |
| bos@144 | 22 |
| bos@144 | 23 int main(int argc, char **argv) |
| bos@564 | 24 { |
| bos@564 | 25 printf("once more, hello.\n"); |
| bos@564 | 26 printf("hello, world!\"); |
| bos@564 | 27 printf("hello again!\n"); |
| bos@144 | 28 return 0; |
| bos@564 | 29 } |
| bos@564 | 30 </screen> |
| bos@611 | 31 <!-- END tour.merge.parents --> |