Documentation / RelNotes / 2.16.4.txton commit t6036: add a failed conflict detection case with symlink modify/modify (c6d3dd5)
   1Git v2.16.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.