Mercurial > hgbook
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 708:c82ff69f0935 | 709:4432ad34b8e5 |
|---|---|
| 1 <!-- BEGIN tour.merge.parents --> | |
| 1 <screen><prompt>$</prompt> <userinput>hg parents</userinput> | 2 <screen><prompt>$</prompt> <userinput>hg parents</userinput> |
| 2 changeset: | 3 changeset: |
| 3 user: Bryan O'Sullivan <bos@serpentine.com> | 4 user: Bryan O'Sullivan <bos@serpentine.com> |
| 4 | 5 |
| 5 summary: A new hello for a new day. | 6 summary: A new hello for a new day. |
| 25 printf("hello, world!\"); | 26 printf("hello, world!\"); |
| 26 printf("hello again!\n"); | 27 printf("hello again!\n"); |
| 27 return 0; | 28 return 0; |
| 28 } | 29 } |
| 29 </screen> | 30 </screen> |
| 31 <!-- END tour.merge.parents --> |