From owner-cvs-all  Tue Feb 12  1:54: 5 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 7ED4A37B400; Tue, 12 Feb 2002 01:54:02 -0800 (PST)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g1C9oGm44061;
	Tue, 12 Feb 2002 01:50:16 -0800 (PST)
	(envelope-from dougb)
Message-Id: <200202120950.g1C9oGm44061@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 12 Feb 2002 01:50:16 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8
X-FreeBSD-CVS-Branch: HEAD
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/02/12 01:50:16 PST

  Modified files:
    usr.sbin/mergemaster mergemaster.8 
  Log:
  * Update (c)
  * Expand on the definition of the -s (strict) option, at the suggestion
  of Gary W. Swearingen, swear@blarg.net.
  
  Revision  Changes    Path
  1.20      +4 -2      src/usr.sbin/mergemaster/mergemaster.8

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