From eaf5341538b467715ea16c27e7fcf440f0117660 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Mon, 23 Nov 2020 19:52:12 -0500 Subject: 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 Signed-off-by: Junio C Hamano --- builtin/stash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin') 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(); -- cgit v1.2.3