Are you actually sure this can't happen, or just want to make sure
we find out about any instances where it does happen? Either way
some explanation in the comment of the reasoning would help.
I never intuitively understand what 'resolveConflicts' is actually
expected to produce. From quick look at the code, which returns a
nested list, I think the outer layer has one element per conflict.
For each conflict, if it is an all-hunk conflict, then the inner
layer is the marked-up conflict followed by the individual
conflicting options. If it's not all-hunk then the inner layer is
just the first of the conflicting options followed by all the
conflicting options. In fact, looking at the uses, I think we always
only take the first option from the inner lists, so maybe we can
simplify the method.
|