diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 20:02:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 21:29:23 (GMT) |
| commit | 43ea635c35371b22a7a2010398d47040c5b95adc (patch) | |
| tree | 39fdf40eba05aba61c7bf2fcfae638bdd66abc09 /builtin/diff-tree.c | |
| parent | 2ae0a9cb8298185a94e5998086f380a355dd8907 (diff) | |
| download | git-43ea635c35371b22a7a2010398d47040c5b95adc.zip git-43ea635c35371b22a7a2010398d47040c5b95adc.tar.gz git-43ea635c35371b22a7a2010398d47040c5b95adc.tar.bz2 | |
i18n: refactor "foo and bar are mutually exclusive"
Use static strings for constant parts of the sentences. They are all
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/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 f33d30d..0e0ac1f 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")); |