RelNoteson commit Merge branch 'fc/rerere-conflict-style' (6d3c4e9)
   1Documentation/RelNotes/2.0.0.txt