t / t5100 / info-from.expecton commit t6036: Add differently resolved modify/delete conflict in criss-cross test (fe7e9c2)
   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