From 80e581a9dae0bbd3a40110fa4a72fffa6dc41b02 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Thu, 12 Sep 2024 13:01:34 -0700
Subject: [PATCH] Enable doctest merging on all editions

---
 src/librustdoc/doctest.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/librustdoc/doctest.rs b/src/librustdoc/doctest.rs
index 05ef72892012d..a4cb75baacfa7 100644
--- a/src/librustdoc/doctest.rs
+++ b/src/librustdoc/doctest.rs
@@ -789,7 +789,7 @@ struct CreateRunnableDocTests {
 
 impl CreateRunnableDocTests {
     fn new(rustdoc_options: RustdocOptions, opts: GlobalTestOptions) -> CreateRunnableDocTests {
-        let can_merge_doctests = rustdoc_options.edition >= Edition::Edition2024;
+        let can_merge_doctests = true;
         CreateRunnableDocTests {
             standalone_tests: Vec::new(),
             mergeable_tests: FxHashMap::default(),