mirrors/git
1
0
Fork 0
Code Issues Pull Requests 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
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); ret = apply_cached(&out);
strbuf_release(&out); strbuf_release(&out);
if (ret) if (ret)
return error(_("conflicts in index." return error(_("conflicts in index. "
"Try without --index.")); "Try without --index."));
discard_cache(); discard_cache();