From: Eric Hanchrow <eric.hanchrow@gmail.com>
Date: Sat, 26 Feb 2011 03:29:42 +0000 (-0800)
Subject: branch_merged: fix grammar in warning
X-Git-Tag: v1.7.4.2~46
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=62270f6b0a4e67e5044fb0d70d0e82ac6e553eb2;p=git.git

branch_merged: fix grammar in warning

Signed-off-by: Eric Hanchrow <eric.hanchrow@gmail.com>
Helped-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/branch.c b/builtin/branch.c
index 9e546e4a8..fe8f2fcd5 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"