From owner-cvs-all  Tue May 28  0:30:26 2002
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 0051C37B406; Tue, 28 May 2002 00:30:21 -0700 (PDT)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4S7UKN43005;
	Tue, 28 May 2002 00:30:20 -0700 (PDT)
	(envelope-from dougb)
Message-Id: <200205280730.g4S7UKN43005@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 28 May 2002 00:30:20 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8
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       2002/05/28 00:30:20 PDT

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster mergemaster.8 
  Log:
  MFC 1.22
  
  Revision  Changes    Path
  1.5.2.10  +4 -1      src/usr.sbin/mergemaster/mergemaster.8

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