summaryrefslogtreecommitdiff
path: root/t/t7604-merge-custom-message.sh
AgeCommit message (Collapse)AuthorFilesLines
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi1-1/+1
Converts tests between t7201-t9001. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-07-06Add new test case to ensure git-merge prepends the custom merge messageLibravatar Miklos Vajna1-0/+37
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>