From owner-cvs-all  Sun Oct 31 20:29: 9 1999
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id ACFF115104; Sun, 31 Oct 1999 20:29:06 -0800 (PST)
	(envelope-from chris@FreeBSD.org)
Received: (from chris@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id UAA23147;
	Sun, 31 Oct 1999 20:29:06 -0800 (PST)
	(envelope-from chris@FreeBSD.org)
Message-Id: <199911010429.UAA23147@freefall.freebsd.org>
From: Chris Costello <chris@FreeBSD.org>
Date: Sun, 31 Oct 1999 20:29:06 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster Makefile mergemaster
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

chris       1999/10/31 20:29:06 PST

  Modified files:
    usr.sbin/mergemaster Makefile 
  Removed files:
    usr.sbin/mergemaster mergemaster 
  Log:
  ``mergemaster'' was repo-copied to ``mergemaster.sh'' as it's a shell script.
  
  Delete the original mergemaster and modify Makefile to install mergemaster.sh.
  
  Seen no problem with by:	billf
  No objections by:		Doug Barton
  
  Revision  Changes    Path
  1.3       +2 -2      src/usr.sbin/mergemaster/Makefile



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message