t / test4012.pngon commit merge: introduce merge.ff configuration variable (f23e8de)
t/test4012.png