t / t5100 / info-from.expecton commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1Author: bare@example.com
   2Email: bare@example.com
   3Subject: testing bare address in from header
   4Date: Sun, 25 May 2008 00:38:18 -0700
   5