Date: Wed, 20 Jun 2001 00:15:39 -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: <200106200715.f5K7FdR20103@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2001/06/20 00:15:39 PDT
Modified files:
usr.sbin/mergemaster mergemaster.sh
Log:
Work around the problem in RELENG_4 where the file doesn't actually
exist, and therefore mm_install is returning the "fail" value of
the test instead of the "success" value for install.
This change is a no-op on HEAD, but since the only harm on RELENG_4
ATM is a spurious warning it can follow the usual MFC practice.
Submitted by: A cast of thousands :-/
Revision Changes Path
1.24 +14 -8 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?200106200715.f5K7FdR20103>