Diff3 seemed to work fine here in preliminary testing. I'll run more test, but just in case, which version of the patch did you use? If you somehow got the .patch file that I included with my original post, which didn't make it to the archive, that version had a bug (as noted in my 2nd post). It's best to use libsvn_diff_new2.patch(.txt), from my 6th post. There is no functional difference between that one and libsvn_diff_new.patch(.txt) from my 2nd post, but it has fewer whitespace changes.
Morten
