HomeFreeBSD

etcupdate: remove redundant diff3 flag

Description

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###

Details

Provenance
thjAuthored on Apr 13 2022, 3:02 PM
Parents
rG869199d9922c: libsysdecode: Fix decoding of Capsicum rights
Branches
Unknown
Tags
Unknown