diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-27 00:52:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-27 00:52:15 -0800 |
| commit | e3d3f7d204c46c034ce71d8116ac21ef613fb263 (patch) | |
| tree | d220a835037daff351682fdea430e0055aeb3b7d /builtin | |
| parent | 046613c5465e4fc0611f93a5ef31d3815fb50c22 (diff) | |
| parent | 62270f6b0a4e67e5044fb0d70d0e82ac6e553eb2 (diff) | |
| download | git-e3d3f7d204c46c034ce71d8116ac21ef613fb263.tar.gz | |
Merge branch 'maint'
* maint:
branch_merged: fix grammar in warning
Diffstat (limited to 'builtin')
| -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" |