>From the error dialog: "In file 'D:\Development\SVN\Releases\TortoiseSVN-1.8.0\ext\subversion\subversion\libsvn_ra_serf\util.c' line 1649: internal malfunction"
In TortoiseSVN, I choose "Reintegrate a branch / automatic merge", picked the correct branch, and pressed the "Test merge" button. Phillip