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

Check in example outputs with begin/end markers.

<!-- BEGIN tour.merge.parents -->
<screen><prompt>$</prompt> <userinput>hg parents</userinput>
changeset:   
user:        Bryan O'Sullivan &lt;[e-mail]&gt;

summary:     A new hello for a new day.

changeset:   
tag:         tip
parent:      
user:        Bryan O'Sullivan &lt;[e-mail]&gt;

summary:     Added an extra line of output

<prompt>$</prompt> <userinput>cat hello.c</userinput>
/*
 * Placed in the public domain by Bryan O'Sullivan.  This program is
 * not covered by patents in the United States or other countries.
 */

#include &lt;stdio.h&gt;

int main(int argc, char **argv)
{
	printf("once more, hello.\n");
	printf("hello, world!\");
	printf("hello again!\n");
	return 0;
}
</screen>
<!-- END tour.merge.parents -->