Page MenuHomeFreeBSD
Files F136679251

D53808.diff
No OneTemporary
Actions

D53808.diff
View Options

diff --git a/contrib/diff/src/diff3.c b/contrib/diff/src/diff3.c
--- a/contrib/diff/src/diff3.c
+++ b/contrib/diff/src/diff3.c
@@ -299,9 +299,9 @@
}
}
- edscript = incompat & ~merge; /* -AeExX3 without -m implies ed script. */
- show_2nd |= ~incompat & merge; /* -m without -AeExX3 implies -A. */
- flagging |= ~incompat & merge;
+ edscript = (incompat != 0) & !merge; /* -AeExX3 without -m implies ed script. */
+ show_2nd |= !incompat & merge; /* -m without -AeExX3 implies -A. */
+ flagging |= !incompat & merge;
if (incompat > 1 /* Ensure at most one of -AeExX3. */
|| finalwrite & merge /* -i -m would rewrite input file. */

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 19, 9:03 PM (18 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25658647
Default Alt Text
D53808.diff (669 B)

Event Timeline