From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- tests/ui/json/json-and-color.stderr | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tests/ui/json/json-and-color.stderr (limited to 'tests/ui/json/json-and-color.stderr') diff --git a/tests/ui/json/json-and-color.stderr b/tests/ui/json/json-and-color.stderr new file mode 100644 index 000000000..1cda6af09 --- /dev/null +++ b/tests/ui/json/json-and-color.stderr @@ -0,0 +1,2 @@ +error: cannot specify the `--color` option with `--json` + -- cgit v1.2.3