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