RelNoteson commit Try normalizing files to avoid delete/modify conflicts when merging (331a183)
   1Documentation/RelNotes-1.7.2.txt