Documentation / RelNotes / 2.8.6.txton commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1Git v2.8.6 Release Notes
   2========================
   3
   4This release forward-ports the fix for "ssh://..." URL from Git v2.7.6