Merge showing many "modified" files with no differences

I'm running the latest TortoiseSVN (build 11792). I'm trying to merge a
branch back into the trunk and the merge is listing a huge number of
files in its "modified" list, but when I try to display the differences
using Tortoise's diff (double-click on the file in the list) the diff
shows no differences. The really changed files also show up in the list
and diffing them shows the correct changes.

It seems Tortoise is confused as to what's changed.
Received on 2008-01-28 18:03:31 CET