branch 1 commit
Branch 2 commit
Merge branch 'b2' into b1

Conflicts:
	branch.txt
	first.txt
Merge pull request #1 from ssbianjp/b1

B1