diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:56 -0800 |
| commit | c17de5a505a2da23fcbfefdc8b0aad3f045a510f (patch) | |
| tree | ffe4bd8ace908793b99ee45fb8e1b17be5fb7e2d /builtin/diff-tree.c | |
| parent | Merge branch 'en/merge-ort-renorm-with-rename-delete-conflict-fix' (diff) | |
| parent | i18n: turn even more messages into "cannot be used together" ones (diff) | |
| download | git-c17de5a505a2da23fcbfefdc8b0aad3f045a510f.tar.gz git-c17de5a505a2da23fcbfefdc8b0aad3f045a510f.zip | |
Merge branch 'ja/i18n-similar-messages'
Similar message templates have been consolidated so that
translators need to work on fewer number of messages.
* ja/i18n-similar-messages:
i18n: turn even more messages into "cannot be used together" ones
i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom"
i18n: factorize "--foo outside a repository"
i18n: refactor "unrecognized %(foo) argument" strings
i18n: factorize "no directory given for --foo"
i18n: factorize "--foo requires --bar" and the like
i18n: tag.c factorize i18n strings
i18n: standardize "cannot open" and "cannot read"
i18n: turn "options are incompatible" into "cannot be used together"
i18n: refactor "%s, %s and %s are mutually exclusive"
i18n: refactor "foo and bar are mutually exclusive"
Diffstat (limited to 'builtin/diff-tree.c')
| -rw-r--r-- | builtin/diff-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index f33d30d57b..0e0ac1f167 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -152,7 +152,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) } if (read_stdin && merge_base) - die(_("--stdin and --merge-base are mutually exclusive")); + die(_("options '%s' and '%s' cannot be used together"), "--stdin", "--merge-base"); if (merge_base && opt->pending.nr != 2) die(_("--merge-base only works with two commits")); |