t / t5100 / rfc2047-info-0007on commit merge-file: add option to select union merge favor (3a15048)
   1Subject: (ab)
   2