diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 20:02:14 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 13:29:23 -0800 |
| commit | 43ea635c35371b22a7a2010398d47040c5b95adc (patch) | |
| tree | 39fdf40eba05aba61c7bf2fcfae638bdd66abc09 /builtin/checkout.c | |
| parent | The fifth batch (diff) | |
| download | git-43ea635c35371b22a7a2010398d47040c5b95adc.tar.gz git-43ea635c35371b22a7a2010398d47040c5b95adc.zip | |
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 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 72beeb49aa..79014e1cb6 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1639,7 +1639,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix, cb_option, toupper(cb_option)); if (opts->overlay_mode == 1 && opts->patch_mode) - die(_("-p and --overlay are mutually exclusive")); + die(_("options '%s' and '%s' cannot be used together"), "-p", "--overlay"); if (opts->checkout_index >= 0 || opts->checkout_worktree >= 0) { if (opts->checkout_index < 0) |