t / t5100 / info0011on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: Xyzzy
   4Date: Fri, 8 Aug 2008 13:08:37 +0200 (CEST)
   5