test
Merge remote-tracking branch 'child/master' into test-merge-child
Merge commit 'd74e520f8f4d380a15a2a0eb0c5b969c7700d477' into test-merge-child
conflict text
Merge commit '3cb67a21d5cb3f7bc83235ddf2b8cd94d7f3cd2b' into test-merge-child

Conflicts:
	child/test2.txt
test3
test4
test1
Merge commit '6110f69f35e76fed7d501d66024674d0d5a396a5' into test-merge-child

Conflicts:
	child/test1.txt
Merge commit '6110f69f35e76fed7d501d66024674d0d5a396a5' into test-merge-child

Conflicts:
	child/test1.txt
test1
test1
test3
Merge remote-tracking branch 'origin/test2' into test-by-child
Merge commit '85e2cdff8f9a5b81787ff61c5f4844f320a5420f' into test-merge-child