t / t5100 / rfc2047-info-0005on commit merge-recursive: Have conflict_rename_delete reuse modify/delete code (e03acb8)
   1Subject: (a)
   2