t / test4012.pngon commit git-revert with conflicts to behave as git-merge with conflicts (a9cb3c6)
t/test4012.png