[radicalbyte]

One of the better merge tools but I'd only recommend it if your language of choice is supported. Otherwise, BeyondCompare is just as good.

[soperj]

I like BeyondCompare, as a free option, I really like Meld, it's similar.