Merging - hard part of process

Hufff, you can guess which reason is that I'm writing this post. Team work is advantage in almost every project, but the dark side of this kind of work is merging from trunk to branch. This process is very simple if you was the only one who made changes over some classes, methods, but when you compare base and working version and you see that your changes are just small part of all changes, then its really ugly feeling, to pick and merge only your code. Even its last step in development process, it gives you a headache.
Tortoise and WinMerge tools are the life saviours for you and your code, easy to use and very compact.
If you use Linux than maybe Meld and KDESvn. could be useful.
What ever tool you use, merging is almost impossible to avoid. Good luck to all SW engineers, maybe there will be more inventive tools over the time, to make this process much more easier, because I believe it should be some other way of 'smart merging', there is a lot of space for it.