From: Brendten Eickstaedt <redmine@...>
Date: 2011-04-09T02:25:57+09:00
Subject: [ruby-core:35664] [Backport92 - Backport #4357] Please backport r30629 and r30630 to 1_9_2


Issue #4357 has been updated by Brendten Eickstaedt.


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

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


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


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