diff en/examples/tour.merge.parents.out @ 144:006bbad1f190

Add expected output files. This makes it possible to spot changes in Mercurial's output and behaviour over time.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/tour.merge.parents.out	Tue Mar 06 21:44:56 2007 -0800
@@ -0,0 +1,28 @@
+$ \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;
+\}