branch commit b
Merge branch 'TestBranch'
commit mast
m commit
branch commit
Merge branch 'TestBranch'

Conflicts:
	src/com/test/pojo/B.java
commit