]> git.ipfire.org Git - thirdparty/git.git/commitdiff
stash: add missing space to an error message
authorKyle Meyer <kyle@kyleam.com>
Tue, 24 Nov 2020 00:52:12 +0000 (19:52 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Nov 2020 20:56:31 +0000 (12:56 -0800)
Restore a space that was lost in 8a0fc8d19d (stash: convert apply to
builtin, 2019-02-25).

Signed-off-by: Kyle Meyer <kyle@kyleam.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/stash.c

index fde6397caa16326912087215383506026d00ab79..5fe2af239465942c61d024009c807294baf1f45a 100644 (file)
@@ -418,7 +418,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
                        ret = apply_cached(&out);
                        strbuf_release(&out);
                        if (ret)
-                               return error(_("conflicts in index."
+                               return error(_("conflicts in index. "
                                               "Try without --index."));
 
                        discard_cache();