Merge branch 'maint'

* maint: branch_merged: fix grammar in warning
2011-02-27 00:52:15 -08:00 · 2011-02-27 00:52:15 -08:00 · e3d3f7d204
commit e3d3f7d204
parent 046613c546 62270f6b0a
1 changed files with 1 additions and 1 deletions
--- 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"