8 Commits

Author	SHA1	Message	Date
seven-phases-max	c523e99622	Property merge via +_: minor test updates.	2014-02-05 00:54:20 +04:00
seven-phases-max	9f4818d8fd	Added support for property merge via +_;	2014-02-04 06:54:05 +04:00
seven-phases-max	361fd89a9b	merging of interleaved properties - fixed a typo in tests	2013-12-19 15:43:37 +04:00
seven-phases-max	ee4e23e15c	fixed merging of interleaved properties	2013-12-19 15:03:07 +04:00
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