From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 16 Dec 2010 08:44:10 +0000 (+0100)
Subject: tweaked merge filter
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=9a793744c678c1face970fcb9499affb24c2cc0d;p=web%2Fkonrad%2Ftwig.git

tweaked merge filter
---

diff --git a/doc/templates.rst b/doc/templates.rst
index bad2cb9..02bbdcc 100644
--- a/doc/templates.rst
+++ b/doc/templates.rst
@@ -1325,6 +1325,8 @@ The ``merge`` filter merges an array or a hash with the value:
 
     {% set items = items|merge({ 'peugeot': 'car' }) %}
 
+    {# items now contains { 'apple': 'fruit', 'orange': 'fruit', 'peugeot': 'car' } #}
+
 List of built-in Tests (new in Twig 0.9.9)
 ------------------------------------------