divergence-resolution: deal with simple "just one moved case" earlier While deciding the resolution parent for content-divergence resolution, now we use 3-way merge logic to check, if only one of them was moved from its original position by comparing the parent of both divergent cset with parent of base.