commit b2
commit b2.1
Merge branch 'branch1' into branch2