t / t5100 / rfc2047-info-0004on commit mergetool--lib: add p4merge as a pre-configured mergetool option (c8998b4)
   1Author: Nathaniel Borenstein (םולש ןב ילטפנ)
   2Email: nsb@thumper.bellcore.com
   3Subject: Test of new header generator
   4