1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/tour.merge.cat.out	Mon Dec 08 12:55:51 2008 -0500
     1.3 @@ -0,0 +1,28 @@
     1.4 +$ \textbf{cat hello.c}
     1.5 +/*
     1.6 + * Placed in the public domain by Bryan O'Sullivan.  This program is
     1.7 + * not covered by patents in the United States or other countries.
     1.8 + */
     1.9 +
    1.10 +#include <stdio.h>
    1.11 +
    1.12 +int main(int argc, char **argv)
    1.13 +\{
    1.14 +	printf("once more, hello.\textbackslash{}n");
    1.15 +	printf("hello, world!\textbackslash{}");
    1.16 +	return 0;
    1.17 +\}
    1.18 +$ \textbf{cat ../my-hello/hello.c}
    1.19 +/*
    1.20 + * Placed in the public domain by Bryan O'Sullivan.  This program is
    1.21 + * not covered by patents in the United States or other countries.
    1.22 + */
    1.23 +
    1.24 +#include <stdio.h>
    1.25 +
    1.26 +int main(int argc, char **argv)
    1.27 +\{
    1.28 +	printf("hello, world!\textbackslash{}");
    1.29 +	printf("hello again!\textbackslash{}n");
    1.30 +	return 0;
    1.31 +\}