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