t / t5100 / rfc2047-info-0006on commit Try normalizing files to avoid delete/modify conflicts when merging (331a183)
   1Subject: (a b)
   2