summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorEric Hanchrow <eric.hanchrow@gmail.com>2011-02-26 03:29:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-27 08:29:58 (GMT)
commit62270f6b0a4e67e5044fb0d70d0e82ac6e553eb2 (patch)
tree3b4293d0534b0a9c4fdda48a91dbaa7002ef0cc2 /builtin/branch.c
parent4cc6260684207865344f5b9a7065284d564d4e61 (diff)
downloadgit-62270f6b0a4e67e5044fb0d70d0e82ac6e553eb2.zip
git-62270f6b0a4e67e5044fb0d70d0e82ac6e553eb2.tar.gz
git-62270f6b0a4e67e5044fb0d70d0e82ac6e553eb2.tar.bz2
branch_merged: fix grammar in warning
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>
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 9e546e4..fe8f2fc 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"