Branch1: add 'branch1.txt'
Branch2: add 'branch2.txt'
Branch2: edit branch2.txt
Merge branch 'branch1'
Merge branch 'branch2'