t / t5100 / rfc2047-info-0004on commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1Author: Nathaniel Borenstein (םולש ןב ילטפנ)
   2Email: nsb@thumper.bellcore.com
   3Subject: Test of new header generator
   4