diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-22 02:34:50 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-22 02:34:50 +0000 |
| commit | 5b1c06c74b65e12c8e552bacf6faed5c0b2826cd (patch) | |
| tree | 4c378096ded924eea76b20eaf02ac81c430932f6 /timev.h | |
| parent | 7b876e65ed79d9ca4a22f7731a463ee30e35b30b (diff) | |
| download | ruby-5b1c06c74b65e12c8e552bacf6faed5c0b2826cd.tar.gz | |
* 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
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'timev.h')
0 files changed, 0 insertions, 0 deletions