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

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