Re: [PATCH] branch_merged: fix grammar in warning

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

 



On Fri, Feb 25, 2011 at 10:33 PM, Eric Hanchrow <eric.hanchrow@xxxxxxxxx> wrote:
> Âbuiltin/branch.c | Â Â2 +-
> Â1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 9e546e4..915f270 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 it has not yet been merged to HEAD.",

You can drop the "it" while you're at it. :-)

j.
--
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]