Cross Reference: /art/test/966-default-conflict

`Name`	`Date`	`Size`
Up to higher level directory
`build`	24-Aug-2016	`906`
`expected.txt`	24-Aug-2016	`529`
`info.txt`	24-Aug-2016	`226`
`src/`	24-Aug-2016
`src2/`	24-Aug-2016