P4merge is my favorite merge tool for this reason. It's also really good at solving whitespace conflicts for you.

I became familiar with it at a previous job that used perforce, and I have just kept using it with git. It's free to download, although you have to fill out an annoying form.