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
..
Bflag_C.out	diff(1): Implement -B/--ignore-blank-lines	2018-08-19 03:57:20 +00:00
Bflag_D.out	diff(1): Implement -B/--ignore-blank-lines	2018-08-19 03:57:20 +00:00
Bflag_F.out	diff(1): Implement -B/--ignore-blank-lines	2018-08-19 03:57:20 +00:00
diff_test.sh	diff(1): reject conflicting formatting options	2020-04-20 16:14:44 +00:00
group-format.out	Implement a basic --changed-group-format	2017-04-20 14:22:33 +00:00
header.out
header_ns.out
ifdef.out	Add a regression test for diff -D	2017-04-20 11:32:18 +00:00
input1.in
input2.in
input_c1.in
input_c2.in
Makefile	diff(1): Implement -B/--ignore-blank-lines	2018-08-19 03:57:20 +00:00
Makefile.depend	DIRDEPS_BUILD: Connect new directories.	2017-10-31 00:04:07 +00:00
simple.out
simple_b.out
simple_e.out
simple_i.out
simple_n.out
simple_p.out
simple_u.out
simple_w.out
unified_9999.out
unified_c9999.out
unified_p.out