RelNoteson commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1Documentation/RelNotes/2.22.0.txt