Documentation / RelNotes / 2.8.1.txton commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1Git v2.8.1 Release Notes
   2========================
   3
   4Fixes since v2.8
   5----------------
   6
   7 * "make rpmbuild" target was broken as its input, git.spec.in, was
   8   not updated to match a file it describes that has been renamed
   9   recently.  This has been fixed.