evolve: fix content-div resolution when in parent-child form case: "two divergent csets where one is the parent of other" cset_b (content-divergent) | cset_a (content-divergent) | ~ Before this patch, we were not correctly handling the case when both the divergent cset are in parent-child form. And its resolution was going through the logic which solves other variants of content-divergence. Resolution (after this patch): merge is performed between the two and parent (or parent's successor, if apply) of lower one is treated as resolution parent.