RelNoteson commit merge-recursive: Small cleanups for conflict_rename_rename_1to2 (a99b7f2)
   1Documentation/RelNotes/1.7.5.4.txt