diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-01 01:49:45 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-01 01:49:45 +0300 |
| commit | fa27e2d103704340d931c5c6670be39ef6a22368 (patch) | |
| tree | 2f87ac5681c427a995f3e4c879310e64d8dee05b /builtin | |
| parent | 43c1c79f1f745c22a47f7263530ba5251f957f41 (diff) | |
| parent | eaf5341538b467715ea16c27e7fcf440f0117660 (diff) | |
Merge branch 'km/stash-error-message-fix'
Error message fix.
* km/stash-error-message-fix:
stash: add missing space to an error message
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 24ddb1bffa..e1f8235fdd 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -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(); |