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

`Name`	`Date`	`Size`
Up to higher level directory
`com/`	08-Oct-2015
`expected.txt`	08-Oct-2015	`5`
`info.txt`	08-Oct-2015	`194`
`run`	08-Oct-2015	`1.2K`
`testdata/`	08-Oct-2015