Use of phpstrom tasks && changelists attracts a such problem with GIT commit message. if the brunch has been merged without conflicts commit message is automatic generate in default GIT style such "Merge remote-tracking branch 'remotes/ ...". But after conflict resolving I must make manually commit and in a commit dialog the message has changelist set format style. Also, I can't write empty message for automatic generation. How to set default GIT commit message for a merge commits only?