From owner-cvs-all  Wed Aug  7  3:58:29 2002
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 371AB37B400; Wed,  7 Aug 2002 03:58:25 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id DEA9C43E72; Wed,  7 Aug 2002 03:58:24 -0700 (PDT)
	(envelope-from blackend@FreeBSD.org)
Received: from freefall.freebsd.org (blackend@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g77AwOJU048586;
	Wed, 7 Aug 2002 03:58:24 -0700 (PDT)
	(envelope-from blackend@freefall.freebsd.org)
Received: (from blackend@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g77AwOGJ048585;
	Wed, 7 Aug 2002 03:58:24 -0700 (PDT)
Message-Id: <200208071058.g77AwOGJ048585@freefall.freebsd.org>
From: Marc Fonvieille <blackend@FreeBSD.org>
Date: Wed, 7 Aug 2002 03:58:24 -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

blackend    2002/08/07 03:58:24 PDT

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster mergemaster.8 
  Log:
  MFC: 1.23, 1.24
  1.23: The .Nm utility
  1.24: Correct links to docs
  
  Revision  Changes    Path
  1.5.2.11  +11 -7     src/usr.sbin/mergemaster/mergemaster.8

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