hgbook

view en/examples/results/tour.merge.parents.out @ 611:4432ad34b8e5

find changesets by author, revision, files, or words in the commit message
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
line source
1 <!-- BEGIN tour.merge.parents -->
2 <screen><prompt>$</prompt> <userinput>hg parents</userinput>
3 changeset:
4 user: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
5
6 summary: A new hello for a new day.
7
8 changeset:
9 tag: tip
10 parent:
11 user: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
12
13 summary: Added an extra line of output
14
15 <prompt>$</prompt> <userinput>cat hello.c</userinput>
16 /*
17 * Placed in the public domain by Bryan O'Sullivan. This program is
18 * not covered by patents in the United States or other countries.
19 */
20
21 #include &lt;stdio.h&gt;
22
23 int main(int argc, char **argv)
24 {
25 printf("once more, hello.\n");
26 printf("hello, world!\");
27 printf("hello again!\n");
28 return 0;
29 }
30 </screen>
31 <!-- END tour.merge.parents -->