branch1 增加文件
branch2提交
test branch 3
Merge branch 'testbranch1' into testbranch3
brach2 modification on testbranch2.txt
brach2 modification on testbranch3.txt
Merge branch 'testbranch2' into testbranch3
Merge pull request #1 from huangttao/testbranch3

Testbranch3