t / test4012.pngon commit merge-recursive: Improve handling of rename target vs. directory addition (51931bf)
t/test4012.png