From 54575d87973b95cbd278fbe086b70761584d286d Mon Sep 17 00:00:00 2001
From: Pranas Kiziela <pranas.kiziela@gmail.com>
Date: Thu, 13 Sep 2012 21:49:49 +0300
Subject: Allow passing block to deep_merge and deep_merge!

Hash#merge accepts block that you can use to customize how hash values
are merged. This change makes merge and deep_merge compatible.
---
 activesupport/CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'activesupport/CHANGELOG.md')

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 0b09f73383..c36df796a8 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   An optional block can be passed to `Hash#deep_merge`. The block will be invoked for each duplicated key
+    and used to resolve the conflict. *Pranas Kiziela*
+
 *   ActiveSupport::Deprecation is now a class. It is possible to create an instance
     of deprecator. Backwards compatibility has been preserved.
 
-- 
cgit v1.2.3