t / t5100 / info0013on commit Try normalizing files to avoid delete/modify conflicts when merging (331a183)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: a patch
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5