t / t5100 / rfc2047-info-0006on commit merge-recursive: Fix multiple file rename across D/F conflict (ae74548)
   1Subject: (a b)
   2