RelNoteson commit Merge branch 'fc/rerere-conflict-style' into maint (ada8710)
   1Documentation/RelNotes/2.0.0.txt