t / test4012.pngon commit Add builtin merge-file, a minimal replacement for RCS merge (ba1f5f3)
t/test4012.png