t / test4012.pngon commit mergetool: Skip autoresolved paths (bb0a484)
t/test4012.png