diff options
| author |  Jeff King <peff@peff.net> | 2009-08-09 06:01:48 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-08-09 12:34:19 -0700 |
| commit | ce0646184696ae6d87c0e243d058cf5df6459c4f (patch) | |
| tree | 40d70e9063f113957fbc23e8a5d041a7187a8511 /exec_cmd.h | |
| parent | Merge branch 'maint-1.6.3' into maint (diff) | |
| download | tgif-ce0646184696ae6d87c0e243d058cf5df6459c4f.tar.xz | |
add tests for merge message headings
When calling "git merge $X", we automatically generate a
commit message containing something like "Merge branch
'$X'". This test script checks that those messages say what
they should, and exposes a failure when merging a refname
that is ambiguous between a tag and a branch.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'exec_cmd.h')
0 files changed, 0 insertions, 0 deletions