2 Commits

Author SHA1 Message Date
Sean Gillies
a807d1bd51 Closes #282.
At the heart of this was a subtle indexing error due to calling
round() instead of math.floor(). Fixing that needed a cascade of
fixes to expectated values in various tests.

Finally, core logic in the merge command was rewritten for
correctness and clarity.
2015-03-11 15:11:52 -06:00
Sean Gillies
3f61be413c Add sample method and tests. 2015-02-09 11:17:56 -07:00