development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'km/stash-error-message-fix'

Browse source 
Error message fix.

* km/stash-error-message-fix:
  stash: add missing space to an error message
This commit is contained in:
Junio C Hamano 2020-11-30 14:49:45 -08:00
parent 43c1c79f1f eaf5341538
commit fa27e2d103
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin/stash.c
View file

@ -419,7 +419,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();