add b1.txt to branch 1
branch b2 add b2.txt
modify b2.txt
Merge branch 'b1'