t / t4252 / file-1-0on commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   11
   22
   33
   44
   55
   66
   77