t1 commit
t2 commit
Merge branch 't1'
Merge branch 't2'

Conflicts:
	test.txt