Date: Tue, 12 Feb 2002 01:50:16 -0800 (PST) From: Doug Barton <dougb@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 Message-ID: <200202120950.g1C9oGm44061@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200202120950.g1C9oGm44061>