svn commit: r303784 - head/usr.sbin/etcupdate

[John Baldwin]

On Friday, August 05, 2016 07:22:33 PM Baptiste Daroussin wrote:
> Author: bapt
> Date: Fri Aug  5 19:22:33 2016
> New Revision: 303784
> URL: https://svnweb.freebsd.org/changeset/base/303784
> 
> Log:
>   etcupdate: directly use diff3(1) instead of merge(1)
>   
>   During the last attempt to rmeove GNU rcs, 2 blockers were spotted:
>   We need an ident(1) and etcupdate(8) uses merge(1).
>   
>   Now nothing should prevent to remove rcs from base
>   
>   Reviewed by:	jhb
>   Differential Revision:	https://reviews.freebsd.org/D7401

Thanks for cleaning this up!

-- 
John Baldwin