a
topic2
sub
Merge branch 'test-topic1-sub'
Merge branch 'topic2'

Conflicts:
	test.txt