hgbook: ja/examples/tour.merge.parents.out annotate

hgbook

Merge with foozy

author	Bryan O'Sullivan <bos@serpentine.com>
date	Fri Aug 14 12:10:47 2009 -0700 (2009-08-14)
parents
children

rev	line source
foozy@708	1 $ \textbf{hg parents}
foozy@708	2 changeset:
foozy@708	3 user: Bryan O'Sullivan <bos@serpentine.com>
foozy@708	4
foozy@708	5 summary: A new hello for a new day.
foozy@708	6
foozy@708	7 changeset:
foozy@708	8 tag: tip
foozy@708	9 parent:
foozy@708	10 user: Bryan O'Sullivan <bos@serpentine.com>
foozy@708	11
foozy@708	12 summary: Added an extra line of output
foozy@708	13
foozy@708	14 $ \textbf{cat hello.c}
foozy@708	15 /*
foozy@708	16 * Placed in the public domain by Bryan O'Sullivan. This program is
foozy@708	17 * not covered by patents in the United States or other countries.
foozy@708	18 */
foozy@708	19
foozy@708	20 #include <stdio.h>
foozy@708	21
foozy@708	22 int main(int argc, char **argv)
foozy@708	23 \{
foozy@708	24 printf("once more, hello.\textbackslash{}n");
foozy@708	25 printf("hello, world!\textbackslash{}");
foozy@708	26 printf("hello again!\textbackslash{}n");
foozy@708	27 return 0;
foozy@708	28 \}