RelNoteson commit merge-recursive: Make dead code for rename/rename(2to1) conflicts undead (0a6b871)
   1Documentation/RelNotes/1.7.5.4.txt