From owner-cvs-all  Thu Sep 17 15:36:14 1998
Return-Path: <owner-cvs-all>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id PAA22915
          for cvs-all-outgoing; Thu, 17 Sep 1998 15:36:14 -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 PAA22872;
          Thu, 17 Sep 1998 15:36:04 -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 PAA28846;
	Thu, 17 Sep 1998 15:35:43 -0700 (PDT)
Date: Thu, 17 Sep 1998 15:35:43 -0700 (PDT)
Message-Id: <199809172235.PAA28846@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG
Subject: cvs commit: ports/sysutils/mergemaster - Imported sources
Sender: owner-cvs-all@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

steve       1998/09/17 15:35:42 PDT

  ports/sysutils/mergemaster - Imported sources
  Update of /home/ncvs/ports/sysutils/mergemaster
  In directory freefall.freebsd.org:/d/users/steve/work/mergemaster
  
  Log Message:
  Initial import of version 1.14 of mergemaster.
  A script to aid with merging configuration files during an upgrade.
  
  PR:		7910
  Submitted by:	Doug <studded@dal.net>
  
  Status:
  
  Vendor Tag:	STUDDED
  Release Tags:	v1_14
  		
  N ports/sysutils/mergemaster/Makefile
  N ports/sysutils/mergemaster/files/md5
  N ports/sysutils/mergemaster/pkg/COMMENT
  N ports/sysutils/mergemaster/pkg/DESCR
  N ports/sysutils/mergemaster/pkg/PLIST
  
  No conflicts created by this import