hgbook: en/examples/tour.merge.cat.out annotate

hgbook

Fix sample output for 'rename.divergent' test.

author	Guido Ostkamp <hg@ostkamp.fastmail.fm>
date	Wed Aug 20 22:01:27 2008 +0200 (2008-08-20)
parents
children

rev	line source
bos@144	1 $ \textbf{cat hello.c}
bos@144	2 /*
bos@144	3 * Placed in the public domain by Bryan O'Sullivan. This program is
bos@144	4 * not covered by patents in the United States or other countries.
bos@144	5 */
bos@144	6
bos@144	7 #include <stdio.h>
bos@144	8
bos@144	9 int main(int argc, char **argv)
bos@144	10 \{
bos@144	11 printf("once more, hello.\textbackslash{}n");
bos@144	12 printf("hello, world!\textbackslash{}");
bos@144	13 return 0;
bos@144	14 \}
bos@144	15 $ \textbf{cat ../my-hello/hello.c}
bos@144	16 /*
bos@144	17 * Placed in the public domain by Bryan O'Sullivan. This program is
bos@144	18 * not covered by patents in the United States or other countries.
bos@144	19 */
bos@144	20
bos@144	21 #include <stdio.h>
bos@144	22
bos@144	23 int main(int argc, char **argv)
bos@144	24 \{
bos@144	25 printf("hello, world!\textbackslash{}");
bos@144	26 printf("hello again!\textbackslash{}n");
bos@144	27 return 0;
bos@144	28 \}