diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-02-26 02:47:35 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-02-26 02:47:35 +0300 |
commit | d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde (patch) | |
tree | 3b0761ff79a4e4a5c50263a8d324b6c6a9268e35 /diff-merges.c | |
parent | a47fcfe8712e3258d1c565cd654c9bd5312a5168 (diff) | |
parent | 9164d97a63b31614a52571d708f1ef151b97db71 (diff) |
Merge branch 'ja/i18n-common-messages'
Unify more messages to help l10n.
* ja/i18n-common-messages:
i18n: fix some misformated placeholders in command synopsis
i18n: remove from i18n strings that do not hold translatable parts
i18n: factorize "invalid value" messages
i18n: factorize more 'incompatible options' messages
Diffstat (limited to 'diff-merges.c')
-rw-r--r-- | diff-merges.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-merges.c b/diff-merges.c index a833fd747a..7f64156b8b 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -78,7 +78,7 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg) diff_merges_setup_func_t func = func_by_opt(optarg); if (!func) - die(_("unknown value for --diff-merges: %s"), optarg); + die(_("invalid value for '%s': '%s'"), "--diff-merges", optarg); func(revs); |