Seconding Sublime Merge. I've been using it since it was launched and it has been a solid tool.