diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 23:02:15 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-06 00:29:23 +0300 |
| commit | c488182903d97da70b7a486e514ab871345067cc (patch) | |
| tree | e5abfa80d7cd54e306792ee9f361276dcb3dfff8 /builtin/difftool.c | |
| parent | 43ea635c35371b22a7a2010398d47040c5b95adc (diff) | |
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 'builtin/difftool.c')
| -rw-r--r-- | builtin/difftool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index 4ee40fe3a0..5beadc07cc 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -733,7 +733,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix) die(_("--dir-diff is incompatible with --no-index")); if (use_gui_tool + !!difftool_cmd + !!extcmd > 1) - die(_("--gui, --tool and --extcmd are mutually exclusive")); + die(_("options '%s', '%s', and '%s' cannot be used together"), "--gui", "--tool", "--extcmd"); if (use_gui_tool) setenv("GIT_MERGETOOL_GUI", "true", 1); |