t / t5100 / rfc2047-info-0003on commit remote-hg: tests: fix hg merge (0c27c12)
   1Author: Patrik Fältström
   2Email: paf@nada.kth.se
   3Subject: RFC-HDR care and feeding
   4