Rob Rix 8b2a9fb6d0 Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly ... # Conflicts: # src/Renderer/JSON.hs # src/Renderer/Patch.hs # test/CorpusSpec.hs		2016-04-04 18:00:25 -04:00
..
crashers	Move the move crash test fixtures into the fixed pile 💃	2016-03-02 18:48:53 -05:00
Data	Disable the Monoid tests over Both Line Char.	2016-03-15 15:52:54 -04:00
diffs	update dictionary.json.js	2016-04-01 16:07:05 -04:00
diffs-todo	Add jquery alignment test case	2016-03-31 13:11:46 -04:00
AlignmentSpec.hs	Put the branch/leaf/info DSL at the top level.	2016-04-01 10:15:48 -04:00
ArbitraryTerm.hs	Represent Both as Join (,).	2016-04-04 15:01:47 -04:00
CorpusSpec.hs	Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly	2016-04-04 18:00:25 -04:00
InterpreterSpec.hs	Also, tests.	2016-03-30 17:33:07 -04:00
OrderedMapSpec.hs	Move OrderedMap into Data.	2016-01-06 11:56:58 -05:00
PatchOutputSpec.hs	Use the curried both constructor.	2016-04-04 14:53:09 -04:00
RangeSpec.hs	Allow all of the tests to run in parallel.	2016-01-05 10:38:51 -05:00
Spec.hs	Test that Both coalesces when both sides coalesce.	2016-03-15 10:50:13 -04:00
TermSpec.hs	Rename Categorizable module to Category	2016-02-04 13:59:33 -05:00