Compare and merge your files

A graphical cross platform diff viewer