From fb64a851e456aa75ea7af2e17b3b70b0f1c111f8 Mon Sep 17 00:00:00 2001
From: Markus Friedl <markus@cvs.openbsd.org>
Date: Tue, 22 Nov 2005 15:59:49 +0000
Subject: enter diff3

---
 regress/usr.bin/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'regress')

diff --git a/regress/usr.bin/Makefile b/regress/usr.bin/Makefile
index fd40f12adad..8aa30014f4c 100644
--- a/regress/usr.bin/Makefile
+++ b/regress/usr.bin/Makefile
@@ -1,6 +1,7 @@
-#	$OpenBSD: Makefile,v 1.12 2005/05/28 04:43:19 marius Exp $
+#	$OpenBSD: Makefile,v 1.13 2005/11/22 15:59:48 markus Exp $
 #	$NetBSD: Makefile,v 1.1 1997/12/30 23:27:11 cgd Exp $
 
-SUBDIR+= basename bc dc diff dirname grep gzsig m4 make patch sort ssh tsort
+SUBDIR+= basename bc dc diff diff3 dirname grep gzsig m4 make patch 
+SUBDIR+= sort ssh tsort
 
 .include <bsd.subdir.mk>
-- 
cgit v1.2.3