t / t5100 / rfc2047-info-0003on commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1Author: Patrik Fältström
   2Email: paf@nada.kth.se
   3Subject: RFC-HDR care and feeding
   4