t / t5100 / rfc2047-info-0003on commit mergetool--lib: add p4merge as a pre-configured mergetool option (c8998b4)
   1Author: Patrik Fältström
   2Email: paf@nada.kth.se
   3Subject: RFC-HDR care and feeding
   4