merge-recursive: honor diff.algorithm

[git/gitster.git] / Documentation / RelNotes / 2.18.5.txt

Git v2.18.5 Release Notes
=========================

This release merges up the fixes that appear in v2.17.6 to address
the security issue CVE-2021-21300; see the release notes for that
version for details.