diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2010-03-24 00:15:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-24 19:39:40 -0700 |
| commit | 419fe5bc861517c789c8f028519e085fd8d1992f (patch) | |
| tree | dfbdaf404cfbfc3c70218e5639aca663d87ea95c /t/t5515/fetch.br-config-explicit-octopus | |
| parent | 5e4f61474202122f376b16181b760f390623bf4e (diff) | |
| download | git-419fe5bc861517c789c8f028519e085fd8d1992f.tar.gz | |
fmt-merge-msg: be quiet if nothing to merge
When FETCH_HEAD contains only 'not-for-merge' entries fmt-merge-msg
still outputs "Merge" (and if the branch isn't master " into <branch>").
In this case fmt-merge-msg is outputting junk and should really just
be quiet. Fix it.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/fetch.br-config-explicit-octopus')
0 files changed, 0 insertions, 0 deletions