t / t5100 / rfc2047-info-0011on commit t6036: add a failed conflict detection case: regular files, different modes (5d1daf3)
   1Subject: (a b)
   2