t / t5100 / msg0009on commit merge-file: add option to select union merge favor (3a15048)
   1This is to fix diff-format documentation.
   2