Page MenuHomeFreeBSD
Files F153297084

D34674.diff
No OneTemporary
Actions

D34674.diff
View Options

Index: usr.sbin/etcupdate/etcupdate.sh
===================================================================
--- usr.sbin/etcupdate/etcupdate.sh
+++ usr.sbin/etcupdate/etcupdate.sh
@@ -849,8 +849,8 @@
# 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

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 7:55 AM (5 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31898123
Default Alt Text
D34674.diff (586 B)

Event Timeline