Date: Wed, 30 May 2001 01:50:11 -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: <200105300850.f4U8oBA17352@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2001/05/30 01:50:11 PDT
Modified files:
usr.sbin/mergemaster mergemaster.sh
Log:
Add the last of the compatibility mods from openbsd. Neatly, the
"install && rm" change fits in with the new FreeBSD default of
copy instead of move for install. Changing the order of the deletion
of the spurious password files doesn't affect FreeBSD functionality,
but it's done in such a way as not to matter.
Obtained from: Christian Weisgerber <naddy@mips.inka.de>
Revision Changes Path
1.23 +15 -10 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?200105300850.f4U8oBA17352>