summaryrefslogtreecommitdiff
path: root/test/prism/ruby/parser_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'test/prism/ruby/parser_test.rb')
-rw-r--r--test/prism/ruby/parser_test.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/prism/ruby/parser_test.rb b/test/prism/ruby/parser_test.rb
index e7cd06bf32..6b72beddc4 100644
--- a/test/prism/ruby/parser_test.rb
+++ b/test/prism/ruby/parser_test.rb
@@ -92,6 +92,11 @@ module Prism
# These files are either failing to parse or failing to translate, so we'll
# skip them for now.
skip_all = skip_incorrect | [
+<<<<<<< HEAD
+=======
+ "unescaping.txt",
+ "seattlerb/regexp_esc_C_slash.txt",
+>>>>>>> 4edfe9d981 (Further refine string handling in the parser translator)
]
# Not sure why these files are failing on JRuby, but skipping them for now.