Documentation / RelNotes / 2.14.4.txton commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1Git v2.14.4 Release Notes
   2=========================
   3
   4This release is to forward-port the fixes made in the v2.13.7 version
   5of Git.  See its release notes for details.