From owner-cvs-all  Thu Sep 17 15:39:25 1998
Return-Path: <owner-cvs-all>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id PAA23376
          for cvs-all-outgoing; Thu, 17 Sep 1998 15:39:25 -0700 (PDT)
          (envelope-from owner-cvs-all)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id PAA23341;
          Thu, 17 Sep 1998 15:39:11 -0700 (PDT)
          (envelope-from steve@FreeBSD.org)
From: Steve Price <steve@FreeBSD.ORG>
Received: (from steve@localhost)
	by freefall.freebsd.org (8.8.8/8.8.5) id PAA28980;
	Thu, 17 Sep 1998 15:38:47 -0700 (PDT)
Date: Thu, 17 Sep 1998 15:38:47 -0700 (PDT)
Message-Id: <199809172238.PAA28980@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG
Subject: cvs commit: ports/sysutils Makefile
Sender: owner-cvs-all@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

steve       1998/09/17 15:38:47 PDT

  Modified files:
    sysutils             Makefile 
  Log:
  Activate mergemaster.
  
  Revision  Changes    Path
  1.43      +2 -1      ports/sysutils/Makefile