Comment 5 for bug 202928

Stefan,

Thanks for filing this bug. I've got a couple of things you might want to try -- I've no idea whether they'll be faster, but the numbers will be interesting.

In trunk, do 'bzr merge --preview ../some-branch'. That's like 'diff -r ancestor' except a little more thorough.

The other thing is to do the operation on the whole tree, rather than a single file. My hunch is that it'll take about the same time as for the one file.

jml