>     MergingStateStore .merge(v1, v2, cb(err, vm, c)) should report a conflict when one occurs
>   ․ MergingStateStore .merge(v1, v2, cb(err, vm, c)) should report a conflict when one occurs
>     MergingStateStore .merge(v1, v2, cb(err, vm, c)) should return a list of the conflicting patches in case of a conflict
>   ․ MergingStateStore .merge(v1, v2, cb(err, vm, c)) should return a list of the conflicting patches in case of a conflict
255c259
<   126 passing (2s)
---
>   128 passing (2s)