view ja/examples/tour.merge.parents.out @ 836:d819bc2414f4

add figs/bad-merge-*.dot. a part of 7226e5e750a6.

$ \textbf{hg parents}
changeset:   
user:        Bryan O'Sullivan <[e-mail]>

summary:     A new hello for a new day.

changeset:   
tag:         tip
parent:      
user:        Bryan O'Sullivan <[e-mail]>

summary:     Added an extra line of output

$ \textbf{cat hello.c}
/*
 * Placed in the public domain by Bryan O'Sullivan.  This program is
 * not covered by patents in the United States or other countries.
 */

#include <stdio.h>

int main(int argc, char **argv)
\{
	printf("once more, hello.\textbackslash{}n");
	printf("hello, world!\textbackslash{}");
	printf("hello again!\textbackslash{}n");
	return 0;
\}