commint at branch
commit conflict
Merge remote-tracking branch 'origin/test_branch'

Conflicts:
	src/com/jji/git/test/TestClass1.java