ブランチ
コミット
test1
Merge branch 'test_branch'

Conflicts:
	test.txt
変更
Merge branch 'master' into test_branch

Conflicts:
	test.txt