[JonChesterfield]

I use meld by default. Honestly it's not great. I kind of miss beyondcompare. It is however readily available and works well enough.