RelNoteson commit merge overwrites unstaged changes in renamed file (30fd3a5)
   1Documentation/RelNotes/1.7.11.txt