test4
test3
Merge remote-tracking branch 'origin/test2' into test-by-child
test3
test3
Conflicts:
	test3.txt
Merge branch 'test-by-parent' of github.com:akirakoyasu/subtree-child into child-test

Conflicts:
	test4.txt