t / t5100 / msg0006on commit merge-file: add option to select union merge favor (3a15048)
   1Here is a patch from A U Thor.
   2