RelNoteson commit Add a rename + D/F conflict testcase (f433f70)
   1Documentation/RelNotes-1.7.1.txt