ruby.git/test/psych/test_merge_keys.rb, branch ruby_1_9_2 The Ruby Programming Language merges r30629 and r30630 from trunk into ruby_1_9_2. 2011-05-31T03:46:21+00:00 yugui yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2011-05-31T03:46:21+00:00 dd0f22f9cbf592d3ae17b03708ab66b4be7e6640 -- * 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
--
* 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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e