t / t5100 / rfc2047-info-0005on commit merge-recursive: check for directory level conflicts (53e32d4)
   1Subject: (a)
   2