You can download CvsConflictEditor 22.214.171.124 from our software library for free. This free software was originally produced by Baptiste Lepilleur. Commonly, this program's installer has the following filename: CvsConflictEditor.exe. The most recent setup file that can be downloaded is 177 KB in size. CvsConflictEditor is categorized as Office Tools. The most popular versions among CvsConflictEditor users are 1.2 and 1.1. Our antivirus scan shows that this download is virus free.
From the developer:
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.
You may want to check out more software, such as SandRibbon for WPF, PDF Converter Professional or GnuWin32: Sed, which might be similar to CvsConflictEditor.