diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-14 06:15:58 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-14 06:15:58 +0000 |
commit | 296f537bf48664461d9c80493357290ce726dbe8 (patch) | |
tree | 9164cd8f79f9e9b317dad2b399778e47b410cae1 /test/psych/test_merge_keys.rb | |
parent | 33ea7a9807a533fe9e29f4cd81a0dfd7da36c5c3 (diff) | |
download | ruby-296f537bf48664461d9c80493357290ce726dbe8.tar.gz |
Merge psych-3.0.0.beta3 from ruby/psych.
* Rely on encoding tags to determine if string should be dumped as binary.
https://github.com/ruby/psych/commit/8949a47b8cee31e03e21608406ba116adcf74054
* Specify "frozen_string_literal: true".
* Support to binary release for mingw32 platform.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/psych/test_merge_keys.rb')
-rw-r--r-- | test/psych/test_merge_keys.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/psych/test_merge_keys.rb b/test/psych/test_merge_keys.rb index 76245ca7b5..1bc3dd1cb6 100644 --- a/test/psych/test_merge_keys.rb +++ b/test/psych/test_merge_keys.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'helper' module Psych |