Date: Mon, 28 May 2001 02:46:19 -0700 (PDT) From: Doug Barton <dougb@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <200105280946.f4S9kJV41690@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2001/05/28 02:46:18 PDT
Modified files:
usr.sbin/mergemaster mergemaster.sh
Log:
Be more consistent with the terminology, referring to "temporary and
installed" instead of "old and new". Inspired by the somewhat
non-linear PR, which really didn't have a fix, per se.
PR: conf/27235 Roelof Osinga <roelof@eboa.com>
Revision Changes Path
1.21 +3 -3 src/usr.sbin/mergemaster/mergemaster.sh
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?200105280946.f4S9kJV41690>