aboutsummaryrefslogtreecommitdiff
path: root/t/t7604-merge-custom-message.sh
Commit message (Collapse)AuthorAge
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-03
| | | | | | | Converts tests between t7201-t9001. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Add new test case to ensure git-merge prepends the custom merge messageMiklos Vajna2008-07-06
There was no test for this before, so the testsuite passed, even in case the merge summary was missing from the merge commit message. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>