t / test4012.pngon commit t6036: tests for criss-cross merges with various directory/file conflicts (827f2b7)
t/test4012.png