From owner-cvs-all  Wed Nov  1  0:34:33 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5CA9837B4C5; Wed,  1 Nov 2000 00:34:31 -0800 (PST)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id AAA06949;
	Wed, 1 Nov 2000 00:34:31 -0800 (PST)
	(envelope-from dougb@FreeBSD.org)
Message-Id: <200011010834.AAA06949@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 1 Nov 2000 00:34:31 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster Makefile mergemaster.8
         mergemaster.sh
X-FreeBSD-CVS-Branch: RELENG_4
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

dougb       2000/11/01 00:34:31 PST

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster Makefile mergemaster.8 mergemaster.sh 
  Log:
  * Adopt solo MAINTAINER here too
  * MFC changes from 1.12 through 1.15
  
  Revision  Changes    Path
  1.3.4.1   +2 -3      src/usr.sbin/mergemaster/Makefile
  1.5.2.2   +59 -7     src/usr.sbin/mergemaster/mergemaster.8
  1.6.2.4   +329 -267  src/usr.sbin/mergemaster/mergemaster.sh



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