branch b2 1 modify
6 modify
branch b1 3 modify
aster merge branch b1 --> no changed added to commit
Merge branch 'master' into b2
Merge branch 'b2'