@tonfa: True, but that doesn't relieve Mercurial of the duty of providing the
correct ancestor to the merge program.

I could also imagine using the changeset date in such a case (later == better).