RelNoteson commit Retire 'stupid' merge strategy (51add76)
   1Documentation/RelNotes-1.6.0.txt