Re: [PATCH] branch_merged: fix grammar in warning

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

 



Eric Hanchrow <eric.hanchrow@xxxxxxxxx> writes:

> OK, here it is again:

Thanks, applied.  I ended up also dropping "has", though ;-)

> From: Eric Hanchrow <eric.hanchrow@xxxxxxxxx>
> Date: Fri, 25 Feb 2011 19:29:42 -0800
> Subject: [PATCH] branch_merged: fix grammar in warning
>
> Signed-off-by: Eric Hanchrow <eric.hanchrow@xxxxxxxxx>
> ---
>  builtin/branch.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 9e546e4..27c2000 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -134,7 +134,7 @@ static int branch_merged(int kind, const char *name,
>  	    in_merge_bases(rev, &head_rev, 1) != merged) {
>  		if (merged)
>  			warning("deleting branch '%s' that has been merged to\n"
> -				"         '%s', but it is not yet merged to HEAD.",
> +				"         '%s', but has not yet been merged to HEAD.",
>  				name, reference_name);
>  		else
>  			warning("not deleting branch '%s' that is not yet merged to\n"
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[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]