diff options
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.bin/rcs/Makefile | 4 | ||||
| -rw-r--r-- | regress/usr.bin/rcs/rcsmerge.out | 17 |
2 files changed, 2 insertions, 19 deletions
diff --git a/regress/usr.bin/rcs/Makefile b/regress/usr.bin/rcs/Makefile index 8dd0dd50ec5..1298829d672 100644 --- a/regress/usr.bin/rcs/Makefile +++ b/regress/usr.bin/rcs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2006/03/14 03:33:30 ray Exp $ +# $OpenBSD: Makefile,v 1.5 2006/03/15 02:36:46 ray Exp $ # Regression tests by Niall O'Higgins <niallo@openbsd.org>. # ksh -> Makefile by Ray Lai <ray@cyth.net>. @@ -21,7 +21,7 @@ REGRESS_TARGETS+=test-rcsdiff-uflag REGRESS_TARGETS+=test-rcsdiff-rflag test-rcs-mflag test-rcs-mflag2 REGRESS_TARGETS+=test-co-RCSINIT test-ci-nflag test-ci-Nflag REGRESS_TARGETS+=test-ci-sflag test-co-lflag2 test-rcsdiff -#REGRESS_TARGETS+=test-rcsmerge +REGRESS_TARGETS+=test-rcsmerge REGRESS_TARGETS+=test-ci-dflag test-ci-xflag test-comma test-ci-initial: clean diff --git a/regress/usr.bin/rcs/rcsmerge.out b/regress/usr.bin/rcs/rcsmerge.out index e29d3eb526b..71ace5fc458 100644 --- a/regress/usr.bin/rcs/rcsmerge.out +++ b/regress/usr.bin/rcs/rcsmerge.out @@ -1,4 +1,3 @@ -<<<<<<< blah.c #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -13,19 +12,3 @@ main(int argc, char **argv) return (0); } -======= -#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 |