t / test4012.pngon commit merge-recursive: Fix D/F conflicts (3734893)
t/test4012.png