t / test4012.pngon commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
t/test4012.png