t / t5100 / rfc2047-info-0011on commit merge-recursive: Fix D/F conflicts (3734893)
   1Subject: (a b)
   2