t / t5100 / rfc2047-info-0005on commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1Subject: (a)
   2