The world's most powerful file comparison and merge app, with deep git integration.