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>
Philip Oakley committed
Jun 4, 2022 at 11:17 UTC
f007713cb101dba76491f18459ae45085b6267a2
1 file changed
+2
-2
builtin/rebase.c
+2
-2
@@ -1183,9 +1183,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
1183
strbuf_reset(&buf);
1184
strbuf_addf(&buf, "%s/rewritten", merge_dir());
1185
if (!(action == ACTION_ABORT) && is_directory(buf.buf)) {
1186
- die("`rebase --preserve-merges` (-p) is no longer supported.\n"
1186
+ die(_("`rebase --preserve-merges` (-p) is no longer supported.\n"
1187
"Use `git rebase --abort` to terminate current rebase.\n"
1188
- "Or downgrade to v2.33, or earlier, to complete the rebase.");
1188
+ "Or downgrade to v2.33, or earlier, to complete the rebase."));
1189
} else {
1190
strbuf_reset(&buf);
1191
strbuf_addf(&buf, "%s/interactive", merge_dir());