t / t5100 / emptyon commit merge-recursive: Have conflict_rename_delete reuse modify/delete code (e03acb8)
   1