t / t5100 / rfc2047-info-0003on commit checkout -m --conflict=diff3: add a label for ancestor (c415162)
   1Author: Patrik Fältström
   2Email: paf@nada.kth.se
   3Subject: RFC-HDR care and feeding
   4