refactor: extract entry merging from ring merging
refactor: extract entry merging from ring merging

paulbellamy/weave,paulbellamy/weave,weaveworks/weave,n054/weave,n054/weave,paulbellamy/weave,n054/weave,weaveworks/weave,n054/weave,n054/weave,weaveworks/weave,paulbellamy/weave,weaveworks/weave