RelNoteson commit Keep rename/rename conflicts of intermediate merges while doing recursive merge (a97e407)
   1Documentation/RelNotes-1.5.1.txt