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.
Comments