Merge branch 'en/merge-path-collision'
[git] / RelNotes
1 Documentation/RelNotes/2.21.0.txt