summaryrefslogtreecommitdiff
path: root/regress/usr.bin/rcs/Makefile
diff options
context:
space:
mode:
authorRay Lai <ray@cvs.openbsd.org>2006-03-15 02:36:47 +0000
committerRay Lai <ray@cvs.openbsd.org>2006-03-15 02:36:47 +0000
commit05d04d8298362f665859c70fa3dbe2cc7f2a8b06 (patch)
treec67e893538aada380b7654430556b6ad9e711b64 /regress/usr.bin/rcs/Makefile
parent5de41dd1a3b917751ca04c2d27ebc51c331539b7 (diff)
Fix and enable rcsmerge test.
rcsmerge stuff ok niallo
Diffstat (limited to 'regress/usr.bin/rcs/Makefile')
-rw-r--r--regress/usr.bin/rcs/Makefile4
1 files changed, 2 insertions, 2 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