Sublime merge is fantastic. Does everything I need. Fast and cross platform.