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