diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 20:02:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 21:31:00 (GMT) |
| commit | 246cac85055f513626159e8cd20b741eaf5f9f97 (patch) | |
| tree | e6d7e00c0918636199eb430e98ecc62e8980ded7 /t/t4209-log-pickaxe.sh | |
| parent | d7d30badbf1ece9c944e41bac4d8aef1117e8b7f (diff) | |
| download | git-246cac85055f513626159e8cd20b741eaf5f9f97.zip git-246cac85055f513626159e8cd20b741eaf5f9f97.tar.gz git-246cac85055f513626159e8cd20b741eaf5f9f97.tar.bz2 | |
i18n: turn even more messages into "cannot be used together" ones
Even if some of these messages are not subject to gettext i18n, this
helps bring a single style of message for a given error type.
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4209-log-pickaxe.sh')
| -rwxr-xr-x | t/t4209-log-pickaxe.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh index 4f820f8..7f6bb27 100755 --- a/t/t4209-log-pickaxe.sh +++ b/t/t4209-log-pickaxe.sh @@ -72,12 +72,12 @@ test_expect_success 'usage' ' grep "cannot be used together" err && test_expect_code 128 git log --pickaxe-all --find-object=HEAD 2>err && - grep "mutually exclusive" err + grep "cannot be used together" err ' test_expect_success 'usage: --pickaxe-regex' ' test_expect_code 128 git log -Gregex --pickaxe-regex 2>err && - grep "mutually exclusive" err + grep "cannot be used together" err ' test_expect_success 'usage: --no-pickaxe-regex' ' |