From d2ecc46c0981fb829fdfb204604ed0a2798cbe07 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 24 May 2020 18:13:53 -0700 Subject: Hopefully final batch before 2.27-rc2 Signed-off-by: Junio C Hamano diff --git a/Documentation/RelNotes/2.27.0.txt b/Documentation/RelNotes/2.27.0.txt index 5fb8c0c..44b4b61 100644 --- a/Documentation/RelNotes/2.27.0.txt +++ b/Documentation/RelNotes/2.27.0.txt @@ -484,6 +484,12 @@ Fixes since v2.26 tree but both would have the contents from "ours". This has been corrected so that the path from each side gets their original content. + * Fix for a copy-and-paste error introduced during 2.20 era. + (merge e68a5272b1 ds/multi-pack-verify later to maint). + + * Update an unconditional use of "grep -a" with a perl script in a test. + (merge 1eb7371236 dd/t5703-grep-a-fix later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 564956f358 jc/maintain-doc later to maint). (merge 7422b2a0a1 sg/commit-slab-clarify-peek later to maint). -- cgit v0.10.2-6-g49f6