t / test4012.pngon commit merge-recursive: Fix working copy handling for rename/rename/add/add (3672c97)
t/test4012.png