SVN always thinks a few certain files need to be merged

[Steve Cohen]

Somewhere back in the distant past, I was a bad bad boy and did 
something that SVN didn't like to get some merge to work.  This happened 
about two years ago.

Since then, these files are picked up for properties merges whenever I 
merge their project even though they haven't really changed in years. 
How can I FIX this merge info so I stop being bothered by them.

This is really annoying.