4 Commits

Author	SHA1	Message	Date
Jordan Suchow	3a8d9b37a6	Remove trailing whitespace	2015-04-19 13:01:38 -07:00
Matthew Honnibal	2ef170a991	* Fix Issue #54: Error merging multi-word token when there's a mid-token match.	2015-04-16 04:28:06 +02:00
Matthew Honnibal	c2b9a61ee2	* Upd merge test	2015-04-07 04:51:31 +02:00
Matthew Honnibal	3f1e17bd3c	* Add tests for new merge() method	2015-03-30 01:37:57 +02:00