diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-09 00:22:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-09 00:22:05 (GMT) |
| commit | 25e2039cf6619870bddc61d020bc5ccde85c6617 (patch) | |
| tree | ad0a02f1a0325d26023b92159e314a6ba9cf038d /revision.c | |
| parent | 173d7746f6c3ee44855be3b6e9aec5457e6174e7 (diff) | |
| parent | 7854bf49604484a7276b96d312b9daf7d15c7b34 (diff) | |
| download | git-25e2039cf6619870bddc61d020bc5ccde85c6617.zip git-25e2039cf6619870bddc61d020bc5ccde85c6617.tar.gz git-25e2039cf6619870bddc61d020bc5ccde85c6617.tar.bz2 | |
Merge branch 'rs/i18n-cannot-be-used-together' into maint-2.43
Clean-up code that handles combinations of incompatible options.
* rs/i18n-cannot-be-used-together:
i18n: factorize even more 'incompatible options' messages
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2403,8 +2403,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->left_right = 1; } else if (!strcmp(arg, "--left-only")) { if (revs->right_only) - die("--left-only is incompatible with --right-only" - " or --cherry"); + die(_("options '%s' and '%s' cannot be used together"), + "--left-only", "--right-only/--cherry"); revs->left_only = 1; } else if (!strcmp(arg, "--right-only")) { if (revs->left_only) |