t / test4012.pngon commit merge_recursive: Fix renames across paths below D/F conflicts (5a2580d)
t/test4012.png