summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-04-16 20:53:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-04-16 20:53:34 (GMT)
commitb0c09ab8796fb736efa432b8e817334f3e5ee75a (patch)
treee13377e296124c803b32671f96113411f5e76556
parent257ae76ba9194c23a57a93033c499ee67bc1b037 (diff)
downloadgit-master.zip
git-master.tar.gz
git-master.tar.bz2
The eleventh (aka "ort") batchHEADmaster
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.32.0.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.32.0.txt b/Documentation/RelNotes/2.32.0.txt
index ea220f2..c746ad1 100644
--- 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
-----------------