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

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