Merge branch 'nd/i18n'
Many more strings are prepared for l10n. * nd/i18n: (23 commits) transport-helper.c: mark more strings for translation transport.c: mark more strings for translation sha1-file.c: mark more strings for translation sequencer.c: mark more strings for translation replace-object.c: mark more strings for translation refspec.c: mark more strings for translation refs.c: mark more strings for translation pkt-line.c: mark more strings for translation object.c: mark more strings for translation exec-cmd.c: mark more strings for translation environment.c: mark more strings for translation dir.c: mark more strings for translation convert.c: mark more strings for translation connect.c: mark more strings for translation config.c: mark more strings for translation commit-graph.c: mark more strings for translation builtin/replace.c: mark more strings for translation builtin/pack-objects.c: mark more strings for translation builtin/grep.c: mark strings for translation builtin/config.c: mark more strings for translation ...
This commit is contained in:
@ -628,7 +628,7 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
|
||||
i++;
|
||||
p[len] = 0;
|
||||
if (handle_line(p, &merge_parents))
|
||||
die ("Error in line %d: %.*s", i, len, p);
|
||||
die("error in line %d: %.*s", i, len, p);
|
||||
}
|
||||
|
||||
if (opts->add_title && srcs.nr)
|
||||
|
||||
Reference in New Issue
Block a user