Initial commit
Add child.txt
Update child.txt
Update
Merge commit 'a0e0ef765207ad1bd9735adacc3da002a2fe4a69'

Conflicts:
	child-dir/child.txt