t / t5100 / info0007on commit mergetool--lib: add p4merge as a pre-configured mergetool option (c8998b4)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: another patch
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5