From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 28 Oct 2013 13:36:23 +0000 (+0100)
Subject: bug #1249 fixed error filename/line when an error occurs in an included file (fabpot)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=72f9bd8ab491364d6b07cc9c06445bd02d55ee8b;p=web%2Fkonrad%2Ftwig.git

bug #1249 fixed error filename/line when an error occurs in an included file (fabpot)

This PR was merged into the master branch.

Discussion
----------

fixed error filename/line when an error occurs in an included file

fixed #1141

Commits
-------

ba0bf63 refactored some tests
1cdc913 fixed error filename/line when an error occurs in an included file
de985a8 failing test
---

72f9bd8ab491364d6b07cc9c06445bd02d55ee8b
diff --cc CHANGELOG
index 9c2d317,55e4b3c..1928339
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,7 -1,6 +1,8 @@@
  * 1.14.2 (2013-XX-XX)
  
+  * fixed error filename/line when an error occurs in an included file
 + * allowed operators that contain whitespaces to have more than one whitespace
 + * allowed tests to be made of 1 or 2 words (like "same as" or "divisible by")
  
  * 1.14.1 (2013-10-15)