branch commit
branch commit 2
before merge
Merge branch 'master' into r2