t / test9200a.pngon commit merge-recursive: Save D/F conflict filenames instead of unlinking them (70cc3d3)
t/test9200a.png