I added a new tale.
I added b1.txt to branch b1 and modified test3.txt.
I added b2.txt into branch b2.
I modified test3.txt in branch b2.
I merged branch b1 back to master.