test.txt追加
test2.txt追加
test.txtにccc追加
Merge branch 'test2'
test.txtにddd追加
Merge branch 'test2'

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/anaguma2261/github_test