hgbook

annotate en/examples/results/tour.merge.parents.out @ 564:0d5935744f87

find changesets by author, revision, files, or words in the commit message
Switch from LaTeX to XML for examples.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Mar 09 21:39:23 2009 -0700 (2009-03-09)
parents 44d1363234d2
children 4432ad34b8e5
rev   line source
bos@564 1 <screen><prompt>$</prompt> <userinput>hg parents</userinput>
bos@144 2 changeset:
bos@564 3 user: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
bos@144 4
bos@144 5 summary: A new hello for a new day.
bos@144 6
bos@144 7 changeset:
bos@144 8 tag: tip
bos@144 9 parent:
bos@564 10 user: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
bos@144 11
bos@144 12 summary: Added an extra line of output
bos@144 13
bos@564 14 <prompt>$</prompt> <userinput>cat hello.c</userinput>
bos@144 15 /*
bos@144 16 * Placed in the public domain by Bryan O'Sullivan. This program is
bos@144 17 * not covered by patents in the United States or other countries.
bos@144 18 */
bos@144 19
bos@564 20 #include &lt;stdio.h&gt;
bos@144 21
bos@144 22 int main(int argc, char **argv)
bos@564 23 {
bos@564 24 printf("once more, hello.\n");
bos@564 25 printf("hello, world!\");
bos@564 26 printf("hello again!\n");
bos@144 27 return 0;
bos@564 28 }
bos@564 29 </screen>