spree/spree — pull request #5589 by mtomov (2014-11-10 14:48:57+00:00)
Title: Fix Order#merge! for custom comparison hooks.

Custom comparison hooks expect a Hash as `options` parameter,
but a LineItem object was passed instead.