summaryrefslogtreecommitdiff
path: root/arm
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-06-27 18:22:07 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-06 19:22:49 -0700
commitc1fb35b98aa36ce789c60520028d95e5f9fee43c (patch)
treeb660342dfb64fc7279aa2bda3b2a2b3137362718 /arm
parentf4022fa33f1b0a63029d1bc3748f01f720151218 (diff)
downloadgit-c1fb35b98aa36ce789c60520028d95e5f9fee43c.tar.gz
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>
Diffstat (limited to 'arm')
0 files changed, 0 insertions, 0 deletions