t / t5100 / rfc2047-info-0003on commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1Author: Patrik Fältström
   2Email: paf@nada.kth.se
   3Subject: RFC-HDR care and feeding
   4