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

[Cy Schubert]

In message <201609181448.u8IEmSNm060141 at 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 direct
>   diff3(1) usage

When we do finally remove GNU RCS from base we should update UPDATING to 
say that ports/devel/rcs57 is 100% compatible with RCS presently in base/. 
ports/devel/rcs is not 100% compatible. Ports that depend on RCS should use 
devel/rcs57 (unless of course a base/rcs port is planned).


-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.