From 12909b6b8a4a51e9d2b46610be4f93c782949c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Wed, 5 Jan 2022 20:02:16 +0000 Subject: i18n: turn "options are incompatible" into "cannot be used together" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-Noël Avila Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano --- builtin/difftool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin/difftool.c') 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"); -- cgit v1.2.3