Merge branch 'develop'
Merge branch 'release-1'
Merge branch 'master' into develop
Added feature2
Changed feature2
Merge branch 'feature2' into develop