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/ls-files.c | |
parent | c488182903d97da70b7a486e514ab871345067cc (diff) | |
download | git-12909b6b8a4a51e9d2b46610be4f93c782949c80.tar.gz |
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/ls-files.c')
-rw-r--r-- | builtin/ls-files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 031fef1bca..9c80cdae95 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -767,7 +767,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) * would not make any sense with this option. */ if (show_stage || show_unmerged) - die("ls-files --with-tree is incompatible with -s or -u"); + die(_("options '%s' and '%s' cannot be used together"), "ls-files --with-tree", "-s/-u"); overlay_tree_on_index(the_repository->index, with_tree, max_prefix); } |