no message
Merge branch 'B1'

* B1:
  no message

Conflicts:
	MyTest
b1 m2
asdfasdf
B1 M2
Merge branch 'B1'

* B1:
  B1 M2

Conflicts:
	MyTest.txt