Exact

Exact Union RegExp

yugui dd0f22f9cb 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e		2011-05-31 03:46:21 +00:00
..
visitors
helper.rb
test_alias_and_anchor.rb
test_array.rb
test_boolean.rb
test_class.rb
test_coder.rb
test_date_time.rb
test_deprecated.rb
test_document.rb
test_emitter.rb
test_encoding.rb
test_engine_manager.rb
test_exception.rb
test_hash.rb
test_json_tree.rb	merges a part of r30931 from trunk into ruby_1_9_2.	2011-05-28 23:31:16 +00:00
test_merge_keys.rb	merges r30629 and r30630 from trunk into ruby_1_9_2.	2011-05-31 03:46:21 +00:00
test_null.rb
test_object.rb
test_omap.rb
test_parser.rb
test_psych.rb
test_scalar.rb
test_scalar_scanner.rb	merges r30957 from trunk into ruby_1_9_2.	2011-05-28 23:31:33 +00:00
test_serialize_subclasses.rb
test_set.rb
test_string.rb
test_struct.rb
test_symbol.rb
test_tainted.rb	Fixes a mistake in merge of r31812.	2011-05-31 02:12:22 +00:00
test_to_yaml_properties.rb
test_tree_builder.rb
test_yaml.rb