The eleventh (aka "ort") batch

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2021-04-16 13:53:00 -07:00
parent 257ae76ba9
commit b0c09ab879
1 changed files with 6 additions and 0 deletions

View File

@ -120,6 +120,12 @@ Performance, Internal Implementation, Development Support etc.

* The last remnant of gettext-poison has been removed.

* The test framework has been taught to optionally turn the default
merge strategy to "ort" throughout the system where we use
three-way merges internally, like cherry-pick, rebase etc.,
primarily to enhance its test coverage (the strategy has been
available as an explicit "-s ort" choice).


Fixes since v2.31
-----------------