Merge branch 'jt/non-blob-lazy-fetch' into maint

diff --git a/builtin/merge.c b/builtin/merge.c
index 77e1694a785f533f2953727897fee8a19fb74d4e..8f4a5065c209b5b50e02271b48277fff90306338 100644 (file)
--- 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,