mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
afea77a72a
commit
f007713cb1
|
@ -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());
|
||||
|
|
Loading…
Reference in a new issue