Merge branch 'ob/sequencer-i18n-fix'

Message update.

* ob/sequencer-i18n-fix:
  sequencer: actually translate report in do_exec()
This commit is contained in:
Junio C Hamano
2023-05-09 16:45:46 -07:00

View File

@ -3626,7 +3626,7 @@ static int do_exec(struct repository *r, const char *command_line)
" git rebase --continue\n" " git rebase --continue\n"
"\n"), "\n"),
command_line, command_line,
dirty ? N_("and made changes to the index and/or the " dirty ? _("and made changes to the index and/or the "
"working tree\n") : ""); "working tree\n") : "");
if (status == 127) if (status == 127)
/* command not found */ /* command not found */