From owner-cvs-all  Wed Nov  8 16:51:42 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 1724F37B479; Wed,  8 Nov 2000 16:51:40 -0800 (PST)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id QAA22921;
	Wed, 8 Nov 2000 16:51:40 -0800 (PST)
	(envelope-from dougb@FreeBSD.org)
Message-Id: <200011090051.QAA22921@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 8 Nov 2000 16:51:39 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-FreeBSD-CVS-Branch: RELENG_4
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

dougb       2000/11/08 16:51:39 PST

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  MFC appropriate bits of 1.16
  
  Approved by:	jkh
  
  Revision  Changes    Path
  1.6.2.5   +8 -2      src/usr.sbin/mergemaster/mergemaster.sh



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