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
2019-09-01 16:51:25 +00:00
2019-06-15 17:08:13 +00:00
2019-01-12 12:35:02 +00:00
2019-07-19 15:10:03 +00:00
2018-12-23 01:05:52 +00:00
2019-12-11 17:37:53 +00:00
2020-02-12 00:16:56 +00:00
2019-09-26 13:27:25 +00:00
2019-08-28 21:01:51 +00:00
2019-08-28 21:01:51 +00:00
2020-04-17 23:14:51 +00:00
2019-12-11 17:37:53 +00:00
2019-12-11 17:37:53 +00:00
2020-04-03 16:54:13 +00:00
2019-03-11 22:23:56 +00:00
2019-01-18 00:26:25 +00:00
2020-02-12 00:16:56 +00:00
2019-09-01 21:20:31 +00:00
2019-03-06 15:19:04 +00:00
2019-09-04 13:44:46 +00:00
2020-04-28 14:33:33 +00:00
2019-12-17 11:03:32 +00:00
2019-07-19 15:10:53 +00:00
2020-02-20 21:29:59 +00:00
2019-09-05 14:13:08 +00:00
2020-03-11 13:51:01 +00:00
2019-01-31 16:49:06 +00:00
2020-04-24 22:02:22 +00:00
2020-01-12 20:25:11 +00:00
2020-04-18 13:29:54 +00:00
2019-01-28 19:54:58 +00:00
2019-10-28 21:48:20 +00:00
2019-09-05 14:13:08 +00:00
2019-12-07 20:01:55 +00:00
2019-04-22 17:52:46 +00:00
2020-04-06 23:28:24 +00:00
2019-09-13 14:51:00 +00:00
2019-12-11 17:37:53 +00:00
2020-03-14 05:57:22 +00:00
2019-12-11 17:37:53 +00:00
2020-03-02 18:40:34 +00:00
2020-04-06 23:20:20 +00:00
2019-02-07 14:29:45 +00:00
2020-04-01 15:08:53 +00:00
2019-09-21 21:02:57 +00:00
2020-02-19 21:03:06 +00:00
2019-10-02 16:08:01 +00:00
2019-08-26 10:18:19 +00:00
2018-11-04 19:24:49 +00:00
2020-04-03 15:47:15 +00:00
2019-01-04 02:48:43 +00:00
2019-08-25 01:05:01 +00:00
2020-03-17 16:42:25 +00:00
2019-11-12 22:31:59 +00:00
2020-03-03 00:20:08 +00:00
2019-06-29 18:41:40 +00:00
2020-01-31 19:06:49 +00:00
2019-09-11 16:00:03 +00:00
2018-10-27 23:31:42 +00:00
2020-03-29 19:16:14 +00:00
2019-03-20 07:40:38 +00:00
2020-04-08 18:43:00 +00:00
2020-04-07 02:46:22 +00:00
2019-09-09 15:37:40 +00:00
2020-04-06 23:28:24 +00:00
2018-11-04 16:58:55 +00:00
2019-04-12 18:35:14 +00:00
2019-05-08 08:43:15 +00:00
2020-02-03 20:46:31 +00:00
2020-01-16 14:14:55 +00:00
2019-08-13 23:32:56 +00:00
2019-03-04 14:30:37 +00:00
2019-12-14 10:53:52 +00:00
2020-03-29 04:18:27 +00:00
2020-04-12 15:16:34 +00:00
2019-02-08 14:31:44 +00:00
2019-12-31 22:25:06 +00:00
2019-12-11 17:37:53 +00:00
2018-11-09 13:47:06 +00:00
2019-09-05 14:13:08 +00:00
2019-11-04 03:07:01 +00:00
2018-11-20 00:06:53 +00:00
2020-03-18 15:02:09 +00:00
2019-03-11 22:23:56 +00:00
2020-01-12 20:25:11 +00:00
2019-07-29 20:43:07 +00:00
2019-09-03 18:58:48 +00:00
2020-04-15 20:25:38 +00:00
2019-09-21 21:02:57 +00:00
2020-02-15 19:13:37 +00:00
2019-04-03 20:37:14 +00:00
2019-12-11 17:37:53 +00:00
2019-10-15 16:05:17 +00:00
2020-04-04 12:07:36 +00:00
2018-11-04 19:24:49 +00:00
2019-12-10 19:16:00 +00:00
2019-03-07 18:24:16 +00:00
2019-01-31 23:21:18 +00:00
2019-12-12 05:11:53 +00:00
2019-12-11 17:37:53 +00:00
2020-04-26 20:55:11 +00:00
2019-12-11 17:37:53 +00:00
2019-10-02 16:08:01 +00:00
2019-05-01 19:35:45 +00:00
2019-12-11 17:37:53 +00:00
2020-03-26 17:58:52 +00:00
2019-02-21 15:08:25 +00:00
2020-03-29 02:30:23 +00:00
2020-03-22 21:51:50 +00:00
2019-01-18 21:30:06 +00:00
2020-02-12 00:16:56 +00:00
2018-11-04 19:24:49 +00:00
2019-12-11 17:37:53 +00:00
2020-03-02 22:19:30 +00:00
2020-04-06 23:28:24 +00:00
2020-04-03 14:47:40 +00:00
2020-02-20 19:07:29 +00:00
2019-09-05 14:13:08 +00:00
2019-11-20 19:43:34 +00:00
2019-12-15 18:05:18 +00:00
2020-03-17 10:02:59 +00:00
2019-08-17 08:29:22 +00:00
2018-11-12 07:14:34 +00:00
2020-04-07 02:46:22 +00:00
2019-07-19 20:04:31 +00:00
2019-12-29 12:24:41 +00:00
2019-08-23 16:03:23 +00:00
2019-08-29 02:44:18 +00:00
2020-04-11 08:16:35 +00:00
2019-09-05 14:13:08 +00:00
2020-02-19 21:03:06 +00:00
2019-08-08 21:15:02 +00:00
2019-01-23 20:02:17 +00:00
2020-04-03 14:03:58 +00:00
2019-11-20 17:24:49 +00:00
2019-12-16 22:05:03 +00:00
2020-01-27 20:47:18 +00:00
2019-04-19 02:54:13 +00:00
2020-03-23 19:01:23 +00:00
277d224e09