t / test9200a.pngon commit merge-recursive: Have conflict_rename_delete reuse modify/delete code (e03acb8)
t/test9200a.png