t / t5100 / rfc2047-info-0006on commit mergetool--lib: add p4merge as a pre-configured mergetool option (c8998b4)
   1Subject: (a b)
   2