Comment 28 for bug 113809

John, I'm not sure where this was discussed previously, but all the bugs seem to be coalescing here.. Anyhow you proposed doing a single merge.

I don't see how that can work: we have in the pathological case 3 heads:
- current tree rev
- current branch tip
- current master tip

Aaron suggested a long time ago that if the first merge conflicts, we should just stop there.