freebsd-nq/usr.sbin/etcupdate
Baptiste Daroussin a7212e5721 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
2016-08-05 19:22:33 +00:00
..
tests Merge ^/user/ngie/release-pkg-fix-tests to unbreak how test files are installed 2016-05-04 23:20:53 +00:00
etcupdate.8 Remove redundant word. 2016-04-26 18:54:44 +00:00
etcupdate.sh etcupdate: directly use diff3(1) instead of merge(1) 2016-08-05 19:22:33 +00:00
Makefile
Makefile.depend Add META_MODE support. 2015-06-13 19:20:56 +00:00