diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-04-16 13:53:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-16 13:53:34 -0700 |
| commit | b0c09ab8796fb736efa432b8e817334f3e5ee75a (patch) | |
| tree | e13377e296124c803b32671f96113411f5e76556 | |
| parent | Merge branch 'ah/merge-ort-ubsan-fix' (diff) | |
| download | tgif-b0c09ab8796fb736efa432b8e817334f3e5ee75a.tar.xz | |
The eleventh (aka "ort") batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/2.32.0.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.32.0.txt b/Documentation/RelNotes/2.32.0.txt index ea220f2a51..c746ad11c9 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 ----------------- |