t / test4012.pngon commit read-tree -u one-way merge fix to check out locally modified paths. (613f027)
t/test4012.png