view ja/examples/tour.diff.out @ 836:d819bc2414f4

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

$ \textbf{hg diff}
diff -r  hello.c


@@ -8,5 +8,6 @@ int main(int argc, char **argv)
 int main(int argc, char **argv)
 \{
 	printf("hello, world!\textbackslash{}");
+	printf("hello again!\textbackslash{}n");
 	return 0;
 \}