From: Fabien Potencier Date: Thu, 7 Mar 2013 06:57:14 +0000 (+0100) Subject: merged branch carlwitt/patch-1 (PR #1022) X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=b6c2171579b4ab8c193322796ef757a185729cb8;p=web%2Fkonrad%2Ftwig.git merged branch carlwitt/patch-1 (PR #1022) This PR was merged into the master branch. Commits ------- 59d0eed Update merge.rst Discussion ---------- Update merge.rst Typo in first line: The merge filter merges an array with [removed: the] another array --- b6c2171579b4ab8c193322796ef757a185729cb8