Improve the merge display when the result differs from all parents.