Add unit-tests for the always_merge setting
    
    With this change we ensure that w/o always_merge we get the expected
    commit messages but with always_merge we get the merge commit even on
    a PR that could have been fast-forwarded