A cross-platform file diff and directory diff Tool. Also contains an SCM project which uses the stand-alone tool. Go to https://vmaster.sourceforge.net to see screenshots or to start the diff tool.
Easy and grafical control version. In particular allow you to go back to your last stable source than compile to do another task when you are block. It use diff and patch. Draw the dependences between commits. Only a click to commit all proyect.