From 9a793744c678c1face970fcb9499affb24c2cc0d Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 16 Dec 2010 09:44:10 +0100
Subject: [PATCH] tweaked merge filter

---
 doc/templates.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/templates.rst b/doc/templates.rst
index bad2cb9e5..02bbdcc28 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)
 ------------------------------------------