[前][次][番号順一覧][スレッド一覧]

ruby-changes:55976

From: Takashi <ko1@a...>
Date: Tue, 4 Jun 2019 00:32:59 +0900 (JST)
Subject: [ruby-changes:55976] Takashi Kokubun: 0da9205f15 (trunk): Remove conflict resolution mistake [ci skip]

https://git.ruby-lang.org/ruby.git/commit/?id=0da9205f15

From 0da9205f154b4562aa575b3811dd0e33bc4b07f4 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Tue, 4 Jun 2019 00:32:16 +0900
Subject: Remove conflict resolution mistake [ci skip]

in de541fe1961370e64541d73c96cf790d30f28604 :bow:

diff --git a/test/irb/test_color.rb b/test/irb/test_color.rb
index 7a12829..916443d 100644
--- a/test/irb/test_color.rb
+++ b/test/irb/test_color.rb
@@ -79,7 +79,7 @@ module TestIRB https://github.com/ruby/ruby/blob/trunk/test/irb/test_color.rb#L79
     end
 
     def test_colorize_code_complete_true
-      # `complete: true` behaviors. Warn compile_error.
+      # `complete: true` behaviors. Warn end-of-file.
       {
         "'foo' + 'bar" => "#{RED}'#{CLEAR}#{RED}foo#{CLEAR}#{RED}'#{CLEAR} + #{RED}'#{CLEAR}#{RED}#{REVERSE}bar#{CLEAR}",
       }.each do |code, result|
@@ -89,7 +89,7 @@ module TestIRB https://github.com/ruby/ruby/blob/trunk/test/irb/test_color.rb#L89
     end
 
     def test_colorize_code_complete_false
-      # `complete: false` behaviors. Do not warn compile_error.
+      # `complete: false` behaviors. Do not warn end-of-file.
       {
         "'foo' + 'bar" => "#{RED}'#{CLEAR}#{RED}foo#{CLEAR}#{RED}'#{CLEAR} + #{RED}'#{CLEAR}#{RED}bar#{CLEAR}",
       }.each do |code, result|
-- 
cgit v0.10.2


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

[前][次][番号順一覧][スレッド一覧]