diff options
| author |  Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 20:02:16 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-01-05 13:29:23 -0800 |
| commit | 12909b6b8a4a51e9d2b46610be4f93c782949c80 (patch) | |
| tree | e0643769171bc1f80a17d52c7724b8fee3b21978 /builtin/difftool.c | |
| parent | i18n: refactor "%s, %s and %s are mutually exclusive" (diff) | |
| download | tgif-12909b6b8a4a51e9d2b46610be4f93c782949c80.tar.xz | |
i18n: turn "options are incompatible" 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 5beadc07cc..c79fbbf67e 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -730,7 +730,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix) setenv(GIT_DIR_ENVIRONMENT, absolute_path(get_git_dir()), 1); setenv(GIT_WORK_TREE_ENVIRONMENT, absolute_path(get_git_work_tree()), 1); } else if (dir_diff) - die(_("--dir-diff is incompatible with --no-index")); + die(_("options '%s' and '%s' cannot be used together"), "--dir-diff", "--no-index"); if (use_gui_tool + !!difftool_cmd + !!extcmd > 1) die(_("options '%s', '%s', and '%s' cannot be used together"), "--gui", "--tool", "--extcmd"); |