t / test4012.pngon commit merge-file: add option to select union merge favor (3a15048)
t/test4012.png