diff options
| author |  Kyle Meyer <kyle@kyleam.com> | 2020-11-23 19:52:12 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-11-24 12:56:31 -0800 |
| commit | eaf5341538b467715ea16c27e7fcf440f0117660 (patch) | |
| tree | 0d3cbd2af45ed71183263ba762d2c9a30fac22e9 /builtin | |
| parent | Git 2.22.4 (diff) | |
| download | tgif-eaf5341538b467715ea16c27e7fcf440f0117660.tar.xz | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/stash.c | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |