RelNoteson commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1Documentation/RelNotes/2.11.1.txt