Merge branch 'maint'

* maint: branch_merged: fix grammar in warning
git-mirror · Feb 27, 2011 · e3d3f7d · e3d3f7d
2 parents 046613c + 62270f6
commit e3d3f7d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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"