Re: svn commit: r305930 - head/usr.sbin/freebsd-update

2016-09-18 Thread Cy Schubert
In message <201609181448.u8iemsnm060...@repo.freebsd.org>, Baptiste Daroussin w rites: > Author: bapt > Date: Sun Sep 18 14:48:28 2016 > New Revision: 305930 > URL: https://svnweb.freebsd.org/changeset/base/305930 > > Log: > In preparation for removal of GNU rcs, replace merge(1) usage with dir

svn commit: r305930 - head/usr.sbin/freebsd-update

2016-09-18 Thread Baptiste Daroussin
Author: bapt Date: Sun Sep 18 14:48:28 2016 New Revision: 305930 URL: https://svnweb.freebsd.org/changeset/base/305930 Log: In preparation for removal of GNU rcs, replace merge(1) usage with direct diff3(1) usage Modified: head/usr.sbin/freebsd-update/freebsd-update.sh Modified: head/usr.s