t / test4012.pngon commit merge-recursive: Defer rename/rename(2to1) handling until process_entry (461f504)
t/test4012.png