t / test4012.pngon commit merge: let custom strategies intervene in trivial merges (52b48ef)
t/test4012.png