From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Feb 2011 08:52:15 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc0~125
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/e3d3f7d204c46c034ce71d8116ac21ef613fb263?hp=046613c5465e4fc0611f93a5ef31d3815fb50c22

Merge branch 'maint'

* maint:
branch_merged: fix grammar in warning
---

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"