Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
branch_merged: fix grammar in warning
author
Eric Hanchrow
<eric.hanchrow@gmail.com>
Sat, 26 Feb 2011 03:29:42 +0000
(19:29 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 27 Feb 2011 08:29:58 +0000
(
00:29
-0800)
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>
builtin/branch.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
4cc6260
)
diff --git
a/builtin/branch.c
b/builtin/branch.c
index 9e546e4a83d07dd6dd4d4b0cb7d23a02c82747fb..fe8f2fcd524cd690c8601d9370079f9d9ea21df3 100644
(file)
--- 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"