t / t5100 / patch0007on commit merge-file: add option to select union merge favor (3a15048)
   1