TEST3
test3 php new file commit
branch 1
branch 2 commit
master commit after branch
Merge branch 'master' into b.1.0
master commit after
after master commit
Merge branch 'b.1.0'
branch!
Merge branch 'b.1.0'
commit master
branch1
test branch2
Merge branch 'b.1.0'

Conflicts:
	test2.txt
branch
Merge branch 'b.1.0'

Conflicts:
	test.txt
master commit
master commit re