diff options
author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 23:02:14 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-01-06 00:29:23 +0300 |
commit | 43ea635c35371b22a7a2010398d47040c5b95adc (patch) | |
tree | 39fdf40eba05aba61c7bf2fcfae638bdd66abc09 /t/t2025-checkout-no-overlay.sh | |
parent | 2ae0a9cb8298185a94e5998086f380a355dd8907 (diff) |
i18n: refactor "foo and bar are mutually exclusive"
Use static strings for constant parts of the sentences. They are all
turned into "cannot be used together".
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/t2025-checkout-no-overlay.sh')
-rwxr-xr-x | t/t2025-checkout-no-overlay.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t2025-checkout-no-overlay.sh b/t/t2025-checkout-no-overlay.sh index fa9e098706..8f13341cf8 100755 --- a/t/t2025-checkout-no-overlay.sh +++ b/t/t2025-checkout-no-overlay.sh @@ -25,7 +25,7 @@ test_expect_success 'checkout --no-overlay removing last file from directory' ' test_expect_success 'checkout -p --overlay is disallowed' ' test_must_fail git checkout -p --overlay HEAD 2>actual && - test_i18ngrep "fatal: -p and --overlay are mutually exclusive" actual + test_i18ngrep "fatal: options .-p. and .--overlay. cannot be used together" actual ' test_expect_success '--no-overlay --theirs with D/F conflict deletes file' ' |