ydiff An attempt to create a beautiful diff tool which is open-source and cross platform Current options: kdiff : open source & cross platform but not beautiful p4merge : Beautiful and cross platform, but not open source