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

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