t / t5100 / rfc2047-info-0003on commit merge: let custom strategies intervene in trivial merges (52b48ef)
   1Author: Patrik Fältström
   2Email: paf@nada.kth.se
   3Subject: RFC-HDR care and feeding
   4