another commit on a branch
Merge branch 'test-branch'

merging into master