t / test4012.pngon commit checkout --conflict=diff3: add a label for ancestor (f0531a2)
t/test4012.png