issue 30: don't overwrite commit message for merge commits