When I\'m doing a TortoiseSVN merge, it includes a bunch of directories, and some files into the modified files, even though there are no actual changes.
If you tick Ignore ancestry it will not create svn mergeinfo in the folders. If you got the svn merge information already, just revert it and do the merge again by checking the ignore ancestry.