Issue #4357 has been updated by Yuki Sonoda.

Status changed from Open to Closed

=begin
merged at r31856.
=end

----------------------------------------
Backport #4357: Please backport r30629 and r30630 to 1_9_2
http://redmine.ruby-lang.org/issues/4357

Author: Aaron Patterson
Status: Closed
Priority: Normal
Assignee: 
Category: 
Target version: 


=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



-- 
http://redmine.ruby-lang.org