https://git.ruby-lang.org/ruby.git/commit/?id=62db6e47b6

From 62db6e47b6c0fbba337649bfa468ec221d5d1001 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Wed, 8 Sep 2021 14:04:43 +0900
Subject: Resolved conflict initializers

---
 tool/lib/test/unit.rb | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb
index 90f13c3..ce470a7 100644
--- a/tool/lib/test/unit.rb
+++ b/tool/lib/test/unit.rb
@@ -42,6 +42,12 @@ module Test https://github.com/ruby/ruby/blob/trunk/tool/lib/test/unit.rb#L42
     module Options # :nodoc: all
       def initialize(*, &block)
         @init_hook = block
+        @report = []
+        @errors = @failures = @skips = 0
+        @verbose = false
+        @mutex = Thread::Mutex.new
+        @info_signal = Signal.list['INFO']
+        @repeat_count = nil
         @options = nil
         super(&nil)
       end
@@ -1421,19 +1427,6 @@ module Test https://github.com/ruby/ruby/blob/trunk/tool/lib/test/unit.rb#L1427
         last_before_assertion.sub(/:in .*$/, '')
       end
 
-      ##
-      # Writes status for failed test +meth+ in +klass+ which finished with
-      # exception +e+
-
-      def initialize # :nodoc:
-        @report = []
-        @errors = @failures = @skips = 0
-        @verbose = false
-        @mutex = Thread::Mutex.new
-        @info_signal = Signal.list['INFO']
-        @repeat_count = nil
-      end
-
       def synchronize # :nodoc:
         if @mutex then
           @mutex.synchronize { yield }
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/