t / test4012.pngon commit t6036: Add differently resolved modify/delete conflict in criss-cross test (fe7e9c2)
t/test4012.png