diff options
author | Takashi Kokubun <takashikkbn@gmail.com> | 2019-06-04 00:32:16 +0900 |
---|---|---|
committer | Takashi Kokubun <takashikkbn@gmail.com> | 2019-06-04 00:32:17 +0900 |
commit | 0da9205f154b4562aa575b3811dd0e33bc4b07f4 (patch) | |
tree | 675907b5b1bc6e2b1a9ebc8e1d5397e0a8fba8ef | |
parent | d21a694075866f4a3333cf65910a649acd057306 (diff) | |
download | ruby-0da9205f154b4562aa575b3811dd0e33bc4b07f4.tar.gz |
Remove conflict resolution mistake [ci skip]
in de541fe1961370e64541d73c96cf790d30f28604 :bow:
-rw-r--r-- | test/irb/test_color.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/irb/test_color.rb b/test/irb/test_color.rb index 7a128295ed..916443d997 100644 --- a/test/irb/test_color.rb +++ b/test/irb/test_color.rb @@ -79,7 +79,7 @@ module TestIRB 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 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| |