Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
[git] / RelNotes
1 Documentation/RelNotes/2.2.0.txt