t / t4252 / file-2-0on commit merge-recursive: Have conflict_rename_delete reuse modify/delete code (e03acb8)
   11
   22
   33
   44
   55
   66
   77