Comment 2 for bug 494197

Revision history for this message
Martin Pool (mbp) wrote :

I see this is still attached to a support ticket.

I'm not sure exactly what this bug is asking for. As part of bug 40412, we did add --show-base for weave merges. The rest of this bug seems to be "if we chose per-file bases for non-weave merges, we ought to use that for --show-base." I agree with that, but it necessarily depends on choosing a per-file base revision within merges, which is not yet supported. Doing so is I think covered by another open merge quality bug.

John, can you explain any more about this bug?