Re: [PATCH] stash: add missing space to an error message

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Kyle Meyer <kyle@xxxxxxxxxx> writes:

> Restore a space that was lost in 8a0fc8d19d (stash: convert apply to
> builtin, 2019-02-25).
>
> Signed-off-by: Kyle Meyer <kyle@xxxxxxxxxx>
> ---

Makes sense.  Thanks.

>  builtin/stash.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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();
>
> base-commit: b291b0a628020eedb10b6236d87fe25d295cea81



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux