I know a lot of you have to resolve merge conflicts. I have always found it difficult to spot and understand what is new and what is the old code. I wrote a small set of parser rules to add syntax colors for merge conflicts in ruby code when using TextMate:
http://zenadmin.org/en/blog/post536.html
Hope this helps.
Gaspard