hoge master
sub
master
Merge branch 'sub2'

Conflicts:
	MyTextFile.txt