t / test9200a.pngon commit merge-recursive: Consider modifications in rename/rename(2to1) conflicts (434b852)
t/test9200a.png