Colobot Forum - International Colobot Community

MELD homepage

A file and folder comparing editor and merge tool. With syntax highlighting.

Two and three-way comparing in real-time as you type.

It even works with version control like GIT and SVN.

And it's free.

I've been using it for a long time and I can recommend it. It's simple, beautiful and it does the job.