t / test4012.pngon commit builtin-merge: allow using a custom strategy (87091b4)
t/test4012.png