t / test4012.pngon commit merge-recursive: Fix multiple file rename across D/F conflict (ae74548)
t/test4012.png