From owner-cvs-all  Sun Jul 15 21: 2:44 2001
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 1C16137B409; Sun, 15 Jul 2001 21:02:39 -0700 (PDT)
	(envelope-from dougb@FreeBSD.org)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f6G42dh94824;
	Sun, 15 Jul 2001 21:02:39 -0700 (PDT)
	(envelope-from dougb)
Message-Id: <200107160402.f6G42dh94824@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 15 Jul 2001 21:02:39 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh
X-FreeBSD-CVS-Branch: RELENG_4
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

dougb       2001/07/15 21:02:39 PDT

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  Catch up to the latest fixes from -current
  
  Revision  Changes    Path
  1.5.2.7   +8 -9      src/usr.sbin/mergemaster/mergemaster.8
  1.6.2.8   +14 -7     src/usr.sbin/mergemaster/mergemaster.sh


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