cherry-pick/revert: add scissors line on merge conflict
[git] / RelNotes
1 Documentation/RelNotes/2.22.0.txt