summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-15 22:08:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-15 22:08:23 (GMT)
commit4bea8485e395769951c6b9eddfba1081ea7ef47f (patch)
treec5165f024d8211bc3295a141226e0b49cf84f1bb /builtin/merge.c
parent3ec5ebee155d69eaa096c57e46be2f20300ddc01 (diff)
parent6b5b309f5e1a5b01642c448eff78d5c5332bf340 (diff)
downloadgit-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/merge.c')
-rw-r--r--builtin/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 77e1694..8f4a506 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -725,7 +725,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
exit(128);
if (write_locked_index(&the_index, &lock,
COMMIT_LOCK | SKIP_IF_UNCHANGED))
- die (_("unable to write %s"), get_index_file());
+ die(_("unable to write %s"), get_index_file());
return clean ? 0 : 1;
} else {
return try_merge_command(strategy, xopts_nr, xopts,