blah b on master
blah c on testBranch
Merge branch 'master' of https://github.com/zrenner/test into testBranch
Merge branch 'testBranch' of https://github.com/zrenner/test into testBranch