hgbook

annotate en/examples/tour.merge.parents.out @ 930:71e726b7f70d

Hum, i don't think that Fink on mac is actually apt-get :)
author Romain PELISSE <romain.pelisse@atosorigin.com>
date Sun Feb 08 22:08:47 2009 +0100 (2009-02-08)
parents
children
rev   line source
bos@144 1 $ \textbf{hg parents}
bos@144 2 changeset:
bos@144 3 user: Bryan O'Sullivan <bos@serpentine.com>
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@144 10 user: Bryan O'Sullivan <bos@serpentine.com>
bos@144 11
bos@144 12 summary: Added an extra line of output
bos@144 13
bos@144 14 $ \textbf{cat hello.c}
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@144 20 #include <stdio.h>
bos@144 21
bos@144 22 int main(int argc, char **argv)
bos@144 23 \{
bos@144 24 printf("once more, hello.\textbackslash{}n");
bos@144 25 printf("hello, world!\textbackslash{}");
bos@144 26 printf("hello again!\textbackslash{}n");
bos@144 27 return 0;
bos@144 28 \}