diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 23:02:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-06 00:31:00 +0300 |
| commit | 246cac85055f513626159e8cd20b741eaf5f9f97 (patch) | |
| tree | e6d7e00c0918636199eb430e98ecc62e8980ded7 /builtin/rebase.c | |
| parent | d7d30badbf1ece9c944e41bac4d8aef1117e8b7f (diff) | |
i18n: turn even more messages into "cannot be used together" ones
Even if some of these messages are not subject to gettext i18n, this
helps bring a single style of message for a given error type.
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/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 16e6053b14..36490d06c8 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1460,8 +1460,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) if (i >= 0) { if (is_merge(&options)) - die(_("cannot combine apply options with " - "merge options")); + die(_("apply options and merge options " + "cannot be used together")); else options.type = REBASE_APPLY; } |