K 10
svn:author
V 4
bapt
K 8
svn:date
V 27
2016-08-05T19:22:33.566717Z
K 7
svn:log
V 301
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

END