hgbook

annotate en/examples/tour.merge.cat.out @ 144:006bbad1f190

Add expected output files.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 06 21:44:56 2007 -0800 (2007-03-06)
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 \}