add option to edit commit message of merges

[maeddeg]

trafficstars

Currently all merges are commited with a standard merge message for bugfixes, hotfixes, features etc.

it would be nice to be able to edit these messages separately for each merge (into develop and into master).