diff options
| author |  Eric Hanchrow <eric.hanchrow@gmail.com> | 2011-02-25 19:29:42 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-02-27 00:29:58 -0800 |
| commit | 62270f6b0a4e67e5044fb0d70d0e82ac6e553eb2 (patch) | |
| tree | 3b4293d0534b0a9c4fdda48a91dbaa7002ef0cc2 | |
| parent | Documentation: clarify -u<mode> option defaults (diff) | |
| download | tgif-62270f6b0a4e67e5044fb0d70d0e82ac6e553eb2.tar.xz | |
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>
| -rw-r--r-- | builtin/branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 9e546e4a83..fe8f2fcd52 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" |