RelNoteson commit merge-recursive: remove ren[12]_other fields from rename_conflict_info (3f9c92e)
   1Documentation/RelNotes/2.22.0.txt