kevans 277d224e09 diff(1): don't reject specifying the same format multiple times ... This may happen, for instance, if one happens to have an alias of diff to diff -up and attempts to specify the amount of context on top of that. Aliases like this may cause other problems, but if they're really not ever generating non-unified diffs then we should at least not break that use-case. In addition, we'll now pick up a format mismatch if -p is specified with !contextual && !unified && !unset. Fix up a small trailing whitespace nit in the tests while we're here, and add tests to make sure that we can double up all the formatting options. Reported by: jbeich MFC after: 3 days		2020-04-28 14:33:33 +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): don't reject specifying the same format multiple times	2020-04-28 14:33:33 +00:00
group-format.out	Implement a basic --changed-group-format	2017-04-20 14:22:33 +00:00
header_ns.out	diff: Show nanoseconds in -u/-c header line.	2017-03-26 19:47:43 +00:00
header.out	diff: Fix mtime of file1 in -u/-c header line.	2017-03-26 14:09:25 +00:00
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_b.out
simple_e.out
simple_i.out
simple_n.out
simple_p.out
simple_u.out
simple_w.out
simple.out
unified_9999.out
unified_c9999.out
unified_p.out