remove merge commits where one parent is an ancestor of the other