From 26ebf6897cf23b58a4e6cb1bba204d75a6825c02 Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Thu, 17 Sep 1998 22:38:47 +0000
Subject: Activate mergemaster.

---
 sysutils/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sysutils')

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 6c1a4c56e922..de32b6ced564 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.41 1998/08/03 06:28:56 nectar Exp $
+# $Id: Makefile,v 1.42 1998/08/10 00:38:09 steve Exp $
 #
 
     SUBDIR += LPRng
@@ -17,6 +17,7 @@
     SUBDIR += lsof
     SUBDIR += manck
     SUBDIR += mei
+    SUBDIR += mergemaster
     SUBDIR += mkhybrid11
     SUBDIR += mkhybrid12
     SUBDIR += mkisofs
-- 
cgit v1.2.3