CvsConflictEditor

CVS Conflict Editor deals with conflict that occurs when merging file with CVS.

trusted DOWNLOAD 406 KB Free

CVS Conflict Editor deals with conflict that occurs when merging file with CVS. This tool read this kind of file, and detect the conflicting block.

The local file (the one you updated/merged into) is shown on the left window, the revision that was merged into the file is shown on the right window.

This program received 1 award
This software was checked for viruses and was found to be clean. Click here to see antivirus report.
trusted DOWNLOAD 406 KB Free
Specifications
Developer:
Baptiste Lepilleur
Latest version:
All versions
License type:
Freeware
Questions & answers