Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH] branch_merged: fix grammar in warning

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:50:40

Eric Hanchrow [off-list ref] writes:
OK, here it is again:
Thanks, applied.  I ended up also dropping "has", though ;-)
quoted hunk
From: Eric Hanchrow <redacted>
Date: Fri, 25 Feb 2011 19:29:42 -0800
Subject: [PATCH] branch_merged: fix grammar in warning

Signed-off-by: Eric Hanchrow <redacted>
---
 builtin/branch.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 9e546e4..27c2000 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 has not yet been merged to HEAD.",
 				name, reference_name);
 		else
 			warning("not deleting branch '%s' that is not yet merged to\n"
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help