From: Kyle Meyer <kyle@kyleam.com>
Date: Tue, 24 Nov 2020 00:52:12 +0000 (-0500)
Subject: stash: add missing space to an error message
X-Git-Tag: v2.30.0-rc0~40^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eaf5341538b467715ea16c27e7fcf440f0117660;p=thirdparty%2Fgit.git

stash: add missing space to an error message

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>
---

diff --git a/builtin/stash.c b/builtin/stash.c
index fde6397caa..5fe2af2394 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -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();