Cross Reference: /dalvik/dx/tests/119-merge-conflict

`Name`	`Date`	`Size`
Up to higher level directory
`build`	21-Aug-2018	`979`
`com/`	21-Aug-2018
`expected.txt`	21-Aug-2018	`5`
`info.txt`	21-Aug-2018	`194`
`run`	21-Aug-2018	`1.4K`
`testdata/`	21-Aug-2018