Project

General

Profile

Backport #4357

Please backport r30629 and r30630 to 1_9_2

Added by tenderlovemaking (Aaron Patterson) over 9 years ago. Updated almost 9 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
[ruby-core:35051]

Description

=begin
A bug was reported with the way Psych handles merge keys in [ruby-core:34679]. These two commits fix merge key handling in Psych.
=end

Also available in: Atom PDF