67c907653e
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 |
||
|---|---|---|
| .. | ||
| Bflag_C.out | ||
| Bflag_D.out | ||
| Bflag_F.out | ||
| diff_test.sh | ||
| group-format.out | ||
| header_ns.out | ||
| header.out | ||
| ifdef.out | ||
| input1.in | ||
| input2.in | ||
| input_c1.in | ||
| input_c2.in | ||
| Makefile | ||
| Makefile.depend | ||
| 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 | ||