projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f4022fa) | patch
Add new test case to ensure git-merge prepends the custom merge message
authorMiklos Vajna <vmiklos@frugalware.org>
Fri, 27 Jun 2008 16:22:07 +0000 (18:22 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Jul 2008 02:22:49 +0000 (19:22 -0700)
commitc1fb35b98aa36ce789c60520028d95e5f9fee43c
treeb660342dfb64fc7279aa2bda3b2a2b3137362718tree | snapshot
parentf4022fa33f1b0a63029d1bc3748f01f720151218commit | diff
Add new test case to ensure git-merge prepends the custom merge message

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>
t/t7604-merge-custom-message.sh [new file with mode: 0755] blob
Git—the stupid content tracker