diff options
| author | Philip Oakley <philipoakley@iee.email> | 2022-06-04 11:17:49 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-06 10:45:54 -0700 |
| commit | f007713cb101dba76491f18459ae45085b6267a2 (patch) | |
| tree | dc0fd165350481e3b9e6ef6cfafcb85469d9473a /builtin/rebase.c | |
| parent | rebase: note `preserve` merges may be a pull config option (diff) | |
| download | git-f007713cb101dba76491f18459ae45085b6267a2.tar.gz git-f007713cb101dba76491f18459ae45085b6267a2.zip | |
rebase: translate a die(preserve-merges) message
This is a user facing message for a situation seen in the wild.
Translate it.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
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 142a40fa99..4a969dca06 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1183,9 +1183,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) strbuf_reset(&buf); strbuf_addf(&buf, "%s/rewritten", merge_dir()); if (!(action == ACTION_ABORT) && is_directory(buf.buf)) { - die("`rebase --preserve-merges` (-p) is no longer supported.\n" + die(_("`rebase --preserve-merges` (-p) is no longer supported.\n" "Use `git rebase --abort` to terminate current rebase.\n" - "Or downgrade to v2.33, or earlier, to complete the rebase."); + "Or downgrade to v2.33, or earlier, to complete the rebase.")); } else { strbuf_reset(&buf); strbuf_addf(&buf, "%s/interactive", merge_dir()); |