Date: Sat, 7 Oct 2000 04:20:01 -0700 (PDT) From: Alfred Perlstein <alfred@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <200010071120.EAA10121@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
alfred 2000/10/07 04:20:01 PDT
Modified files: (Branch: RELENG_4)
usr.sbin/mergemaster mergemaster.sh
Log:
Bring in my mergemaster mega-patch for better interaction with
users, also bring in several fixes that were done to my patch.
Version 1.10 was pre-MFC'd.
MFC: 1.7 (mega), 1.8 (fix), 1.9 (fix)
Revision Changes Path
1.6.2.3 +157 -109 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?200010071120.EAA10121>