Page MenuHomeFreeBSD
Files F149669820

D53808.id166692.diff
No OneTemporary
Actions

D53808.id166692.diff
View Options

Index: contrib/diff/src/diff3.c
===================================================================
--- contrib/diff/src/diff3.c
+++ 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 & !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
Fri, Mar 27, 3:40 AM (8 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30407885
Default Alt Text
D53808.id166692.diff (692 B)

Event Timeline