t / t5100 / rfc2047-info-0005on commit t6036: Add differently resolved modify/delete conflict in criss-cross test (fe7e9c2)
   1Subject: (a)
   2