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	merges r28550,r28551,r28554 and r28558 from trunk into ruby_1_9_2.	2010-07-10 04:05:52 +00:00
helper.rb
test_alias_and_anchor.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_array.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_boolean.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_class.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_coder.rb	merges r30475 from trunk into ruby_1_9_2.	2011-01-16 12:34:53 +00:00
test_date_time.rb	merges r28541 from trunk into ruby_1_9_2.	2010-07-10 04:05:47 +00:00
test_deprecated.rb	* ext/psych/lib/psych/deprecated.rb: adding deprecated object_maker	2010-04-27 20:40:12 +00:00
test_document.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_emitter.rb	* test/psych/test_emitter.rb (setup): encoding of @out should be same as script's.	2010-03-31 06:33:45 +00:00
test_encoding.rb	merges r27723 from trunk into ruby_1_9_2.	2010-05-16 03:07:52 +00:00
test_engine_manager.rb	* lib/yaml: Moved to ext/syck/lib, Syck only uses Syck constant.	2010-04-03 21:50:47 +00:00
test_exception.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_hash.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
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/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_object.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_omap.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_parser.rb	merges r30628 from trunk into ruby_1_9_2.	2011-01-28 02:25:31 +00:00
test_psych.rb	merges r28361 from trunk into ruby_1_9_2.	2010-06-29 14:48:12 +00:00
test_scalar.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
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/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_set.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_string.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_struct.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_symbol.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_tainted.rb	Fixes a mistake in merge of r31812.	2011-05-31 02:12:22 +00:00
test_to_yaml_properties.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_tree_builder.rb	* test/psych/*: switching tests to use relative require.	2010-03-29 18:25:57 +00:00
test_yaml.rb	merges r30763 from trunk into ruby_1_9_2.	2011-03-28 13:40:59 +00:00