t / t5100 / patch0007on commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1