merges r30629 and r30630 from trunk into ruby_1_9_2.¶
ext/psych/lib/psych/visitors/to_ruby.rb: merge keys are actually part of YAML 1.1, so they should be supported. Remove warning and merge keys to parent. [ruby-core:34679]
test/psych/test_merge_keys.rb: test for merge keys --
ext/psych/lib/psych/visitors/to_ruby.rb: fixing merge key support when multiple merge keys are specified.
test/psych/test_merge_keys.rb: tests for multi-merge key support
Added by yugui (Yuki Sonoda) over 14 years ago
merges r30629 and r30630 from trunk into ruby_1_9_2.¶
part of YAML 1.1, so they should be supported. Remove warning and
merge keys to parent. [ruby-core:34679]
--
when multiple merge keys are specified.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e