Date: Sun, 30 Jun 2002 12:01:35 -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: <200206301901.g5UJ1ZcL012915@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2002/06/30 12:01:35 PDT
Modified files: (Branch: RELENG_4)
usr.sbin/mergemaster mergemaster.sh
Log:
MFC the "press enter to continue" bit from 1.32, and the handling of
chflags from 1.3[45]. At this time I don't plan to import stat(1)
into RELENG_4, so the perl -> stat bits are left out for now.
The somewhat rapid MFC of the chflags stuff is being done at the
request of des in order to facilitate the ssh upgrade in this branch.
Revision Changes Path
1.6.2.14 +18 -11 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?200206301901.g5UJ1ZcL012915>