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

`Name`	`Date`	`Size`
Up to higher level directory
`com/`	03-Dec-2014
`expected.txt`	03-Dec-2014	`5`
`info.txt`	03-Dec-2014	`194`
`run`	03-Dec-2014	`1.2K`
`testdata/`	03-Dec-2014