this patch add second variant of "changeset we initiated the resolution (of content-divergent changesets which are in parent-child form) from"
