From: Miklos Vajna <vmiklos@frugalware.org>
Date: Fri, 27 Jun 2008 16:22:07 +0000 (+0200)
Subject: Add new test case to ensure git-merge prepends the custom merge message
X-Git-Tag: v1.6.0-rc0~51^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c1fb35b98aa36ce789c60520028d95e5f9fee43c?ds=inline;hp=c1fb35b98aa36ce789c60520028d95e5f9fee43c

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>
---