Skip to content

Commit f007713

Browse files
PhilipOakleygitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent afea77a commit f007713

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

builtin/rebase.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,9 +1183,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
11831183
strbuf_reset(&buf);
11841184
strbuf_addf(&buf, "%s/rewritten", merge_dir());
11851185
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"
11871187
"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."));
11891189
} else {
11901190
strbuf_reset(&buf);
11911191
strbuf_addf(&buf, "%s/interactive", merge_dir());

0 commit comments

Comments
 (0)