From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Feb 2011 09:17:07 GMT
Subject: Re: [PATCH] branch_merged: fix grammar in warning
Message-ID: <7vy6514z1o.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTikL1KkSTeNgT2dhE2bGBu5FHY8HiqxfjPMd90sT@mail.gmail.com>

Eric Hanchrow <eric.hanchrow@gmail.com> writes:

> OK, here it is again:

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

> From: Eric Hanchrow <eric.hanchrow@gmail.com>
> Date: Fri, 25 Feb 2011 19:29:42 -0800
> Subject: [PATCH] branch_merged: fix grammar in warning
>
> Signed-off-by: Eric Hanchrow <eric.hanchrow@gmail.com>
> ---
>  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"