RelNoteson commit Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution' (785514b)
   1Documentation/RelNotes/2.2.0.txt