4 Commits

Author SHA1 Message Date
Luke Page
5cb5f561c8 Convert property merging to the new agreed syntax of +: 2013-07-05 06:51:41 +01:00
Luke Page
577d24cc97 Fix merge tests when running in phantomjs 2013-07-05 06:51:40 +01:00
Daniel Katz
ff029c34bd Syntax changed to !merge(space | comma)
* Syntax changed to !merge(space | comma)
* !merge(space) implemented by Expression instead of Value.
* Added test for lonely property with !merge directive
2013-07-05 06:51:40 +01:00
Daniel Katz
5dde7b3381 Added support and tests for !merge() syntax #700 2013-07-05 06:51:39 +01:00