I can't recommend Sublime Merge enough. Many tools out there do the same job, but half as fast with way less style.