Strange tree conflict problem

[Thomas Börkel <tb...@ap-ag.com>]

HI!

I am merging the diff between branch A and branch B to a working copy of
branch C.

Now I get a tree conflict for some files. TortoiseSVN 1.6.12 says "The
last merge operation tried to delete/move/rename the file 'name', but it
was already edited."

I also get a tree conflict, if I do the merge with the svn commandline
client 1.6.12.

The strange thing is:
When I do a diff between the file in branch A and in branch B, it is not
different at all. So what does it want to merge?

Also, the file does exist in the target working copy and it is not
locally modified.

Our server runs svn 1.6.13.

Any help would be greatly appreciated.

Thomas