Kyle Evans db9cccfbb1 diff(1): reject conflicting formatting options ... This matches GNU diff(1) behavior and, more importantly, eliminates any source of confusion if multiple formatting options are specified. Note that the committed diff differs slightly from the submitted: I've modified it so that we initialize diff_format to something that isn't an accepted format option so that we can also reject --normal -c and -c --normal, which would've otherwise been accepted because the default was --normal. After option parsing we default it to D_NORMAL if it's still unset. PR: 243975 Submitted by: fehmi noyan isi MFC after: 1 week		2020-04-20 16:14:44 +00:00
..
tests	diff(1): reject conflicting formatting options	2020-04-20 16:14:44 +00:00
diff.1	diff: fix segfault with --tabsize and no/malformed argument	2020-02-13 20:23:55 +00:00
diff.c	diff(1): reject conflicting formatting options	2020-04-20 16:14:44 +00:00
diff.h	diff(1): reject conflicting formatting options	2020-04-20 16:14:44 +00:00
diffdir.c	diff: Import fixes from OpenBSD	2018-06-09 21:09:24 +00:00
diffreg.c	diff: implement -y (--side-by-side) along with -W and --suppress-common-lines	2020-02-07 10:17:13 +00:00
Makefile	Isolate the pr(1) related code in its own source files	2018-06-09 20:24:17 +00:00
pr.c	Fix memory leak	2018-06-12 16:42:11 +00:00
pr.h	Isolate the pr(1) related code in its own source files	2018-06-09 20:24:17 +00:00
TODO	Update diff(1) TODO removing what has been implemented	2020-02-07 10:18:01 +00:00
xmalloc.c	asprintf returns -1, not an arbitrary value < 0. Also upon error the	2020-01-14 08:18:04 +00:00
xmalloc.h