From 62270f6b0a4e67e5044fb0d70d0e82ac6e553eb2 Mon Sep 17 00:00:00 2001 From: Eric Hanchrow Date: Fri, 25 Feb 2011 19:29:42 -0800 Subject: branch_merged: fix grammar in warning Signed-off-by: Eric Hanchrow Helped-by: Jay Soffian Signed-off-by: Junio C Hamano --- builtin/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/branch.c b/builtin/branch.c index 9e546e4a83..fe8f2fcd52 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 not yet been merged to HEAD.", name, reference_name); else warning("not deleting branch '%s' that is not yet merged to\n" -- cgit v1.2.3