1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/examples/tour.merge.parents.out	Sat Aug 22 18:22:25 2009 +0200
     1.3 @@ -0,0 +1,28 @@
     1.4 +$ \textbf{hg parents}
     1.5 +changeset:   
     1.6 +user:        Bryan O'Sullivan <bos@serpentine.com>
     1.7 +
     1.8 +summary:     A new hello for a new day.
     1.9 +
    1.10 +changeset:   
    1.11 +tag:         tip
    1.12 +parent:      
    1.13 +user:        Bryan O'Sullivan <bos@serpentine.com>
    1.14 +
    1.15 +summary:     Added an extra line of output
    1.16 +
    1.17 +$ \textbf{cat hello.c}
    1.18 +/*
    1.19 + * Placed in the public domain by Bryan O'Sullivan.  This program is
    1.20 + * not covered by patents in the United States or other countries.
    1.21 + */
    1.22 +
    1.23 +#include <stdio.h>
    1.24 +
    1.25 +int main(int argc, char **argv)
    1.26 +\{
    1.27 +	printf("once more, hello.\textbackslash{}n");
    1.28 +	printf("hello, world!\textbackslash{}");
    1.29 +	printf("hello again!\textbackslash{}n");
    1.30 +	return 0;
    1.31 +\}