The eleventh (aka "ort") batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 16, 2021 at 13:53 UTC
b0c09ab8796fb736efa432b8e817334f3e5ee75a
1 file changed
+6
Documentation/RelNotes/2.32.0.txt
+6
@@ -120,6 +120,12 @@ Performance, Internal Implementation, Development Support etc.
120
121
* The last remnant of gettext-poison has been removed.
122
123
+ * The test framework has been taught to optionally turn the default
124
+ merge strategy to "ort" throughout the system where we use
125
+ three-way merges internally, like cherry-pick, rebase etc.,
126
+ primarily to enhance its test coverage (the strategy has been
127
+ available as an explicit "-s ort" choice).
128
+
129
130
Fixes since v2.31
131
-----------------