annotate: Fix bug when parsing merges with differing real and logical parents.