basho/riak_kv — pull request #813 by cmeiklejohn (2014-01-22 20:03:10+00:00)
Title: Handle all return values of merge.

In the event that two objects, which are strict ancestors of themselves
are compared, handle that as if there are no strict ancestors available.
This prevents a crash of the kv_vnode during a put request.