(mostly) @tonfa again: The real problem I have with Mercurial's behavior is that
a completely unrelated change 10000 lines away causes a completely different
merge result -- because when the file text does not match 100% anymore, the
ancestor calculation is correct.