t / test4012.pngon commit t6036: Add testcase for undetected conflict (f63622c)
t/test4012.png