diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 20:02:15 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 13:29:23 -0800 |
| commit | c488182903d97da70b7a486e514ab871345067cc (patch) | |
| tree | e5abfa80d7cd54e306792ee9f361276dcb3dfff8 /diff.c | |
| parent | 43ea635c35371b22a7a2010398d47040c5b95adc (diff) | |
| download | git-c488182903d97da70b7a486e514ab871345067cc.tar.gz | |
i18n: refactor "%s, %s and %s are mutually exclusive"
Use placeholders for constant tokens. The strings are 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 'diff.c')
| -rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4642,7 +4642,7 @@ void diff_setup_done(struct diff_options *options) die(_("--name-only, --name-status, --check and -s are mutually exclusive")); if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)) - die(_("-G, -S and --find-object are mutually exclusive")); + die(_("options '%s', '%s', and '%s' cannot be used together"), "-G", "-S", "--find-object"); if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_G_REGEX_MASK)) die(_("-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S")); |