opnsense-src/usr.sbin/etcupdate
Tom Jones 016bfb0a97 etcupdate: remove redundant diff3 flag
-A and -m select different output modes output modes for diff3. When
both flags are present gnu diff3 prefers -m, drop the extra -A flag in
etcupdate.

Reviewed by:	pstef, 0mp
MFC after:	3 days
Sponsored by:	Klara Inc
Differential Revision:	<https://reviews.freebsd.org/D###>
2022-04-13 16:05:32 +01: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 etcupdate: Add -D destdir to usage for 'extract'. 2021-04-26 09:49:34 -07:00
etcupdate.sh etcupdate: remove redundant diff3 flag 2022-04-13 16:05:32 +01:00
Makefile Add HAS_TESTS to all Makefiles that are currently using the 2017-08-02 08:50:42 +00:00
Makefile.depend Add META_MODE support. 2015-06-13 19:20:56 +00:00