t / test4012.pngon commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
t/test4012.png