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

`Name`	`Date`	`Size`
Up to higher level directory
`com/`	06-Dec-2016
`expected.txt`	06-Dec-2016	`5`
`info.txt`	06-Dec-2016	`194`
`run`	06-Dec-2016	`1.3K`
`testdata/`	06-Dec-2016