mergetest2.hg contains another slightly artificial but not unrealistic scenario.

1.0.1 seems to merge it in strange ways; structurally similar sections are
merged differently. That might be one part of what tonfas patch fixes.

But it is my understanding that with tonfas patch then mercurial intentionally
merges the heads in what turns out to be the "wrong" way.