1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Remove conflict resolution mistake [ci skip]

in de541fe196 🙇
This commit is contained in:
Takashi Kokubun 2019-06-04 00:32:16 +09:00
parent d21a694075
commit 0da9205f15
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD

View file

@ -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|