mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-16 10:20:30 +00:00
016bfb0a97
-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###> |
||
---|---|---|
.. | ||
tests | ||
etcupdate.8 | ||
etcupdate.sh | ||
Makefile | ||
Makefile.depend |