Merge branch 'fc/rerere-conflict-style' into maint
[git] / RelNotes
1 Documentation/RelNotes/2.0.0.txt