The branch main has been updated by thj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=016bfb0a974a97683ff81d949bbc2460323023b4
commit 016bfb0a974a97683ff81d949bbc2460323023b4
Author: Tom Jones <t...@freebsd.org>
AuthorDate: 2022-04-13 15:02:15 +0000
Commit: Tom Jones <t...@freebsd.org>
CommitDate: 2022-04-13 15:05:32 +0000
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###>
---
usr.sbin/etcupdate/etcupdate.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
index 162a44059e3e..40868fe6586e 100755
--- a/usr.sbin/etcupdate/etcupdate.sh
+++ b/usr.sbin/etcupdate/etcupdate.sh
@@ -849,8 +849,8 @@ merge_file()
# the conflicts directory.
if [ -z "$dryrun" ]; then
install_dirs $NEWTREE $CONFLICTS $1
- log "diff3 -m -A ${DESTDIR}$1 ${CONFLICTS}$1"
- diff3 -m -A -L "yours" -L "original" -L "new" \
+ log "diff3 -m ${DESTDIR}$1 ${CONFLICTS}$1"
+ diff3 -m -L "yours" -L "original" -L "new" \
${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > \
${CONFLICTS}$1
fi
