The eleventh (aka "ort") batch

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.32.0.txt b/Documentation/RelNotes/2.32.0.txt
index ea220f2a515ca784663e0400ec88b0bf18f4f859..c746ad11c92c9464d6b1df74b5efec46032ce36d 100644 (file)
--- a/Documentation/RelNotes/2.32.0.txt
+++ b/Documentation/RelNotes/2.32.0.txt
@@ -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
 -----------------