I've had very good experiences with DiffMerge, nice thing about it that it has a client for Windows, Mac and Linux and it works well. The downside is that it's REALLY uggly
https://sourcegear.com/diffmerge/
I've had very good experiences with DiffMerge, nice thing about it that it has a client for Windows, Mac and Linux and it works well. The downside is that it's REALLY uggly
https://sourcegear.com/diffmerge/