mirror of
https://github.com/opnsense/src.git
synced 2026-02-27 11:50:47 -05:00
-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 | ||