RCS regression tests.

ok joris, niallo, otto, and xsa

1 files changed, 33 insertions, 0 deletions

diff --git a/regress/usr.bin/rcs/rcsmerge.out b/regress/usr.bin/rcs/rcsmerge.out
new file mode 100644
index 00000000000..ca484deddc2
--- /dev/null
+++ b/regress/usr.bin/rcs/rcsmerge.out
@@ -0,0 +1,33 @@
+<<<<<<< blah.c
+/* $Id: rcsmerge.out,v 1.1 2006/03/11 06:22:47 ray Exp $ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* a comment */
+
+/* main function */
+int
+main(int argc, char **argv)
+{
+	printf("foo bar\n");
+
+	return (0);
+}
+=======
+/* $Id: rcsmerge.out,v 1.1 2006/03/11 06:22:47 ray Exp $ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* a comment */
+
+/* main function */
+int
+main(int argc, char **argv)
+{
+	printf("foo bar\n");
+
+	return (0);
+}
+>>>>>>> 1.3