t6036: tests for criss-cross merges with various directory/file conflicts