diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-15 22:08:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 22:08:23 (GMT) |
| commit | 4bea8485e395769951c6b9eddfba1081ea7ef47f (patch) | |
| tree | c5165f024d8211bc3295a141226e0b49cf84f1bb /builtin/fmt-merge-msg.c | |
| parent | 3ec5ebee155d69eaa096c57e46be2f20300ddc01 (diff) | |
| parent | 6b5b309f5e1a5b01642c448eff78d5c5332bf340 (diff) | |
| download | git-4bea8485e395769951c6b9eddfba1081ea7ef47f.zip git-4bea8485e395769951c6b9eddfba1081ea7ef47f.tar.gz git-4bea8485e395769951c6b9eddfba1081ea7ef47f.tar.bz2 | |
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
...
Diffstat (limited to 'builtin/fmt-merge-msg.c')
| -rw-r--r-- | builtin/fmt-merge-msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index ca9206f..f35ff16 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -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) |