t / t5100 / info0001on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: a commit.
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5