Add new test case to ensure git-merge prepends the custom merge message