PROGRAMS BY sf.net/projects/conflicteditor

CVS Conflict Editor is the must have companion to CVS and WinCVS. No more scrolling down chasing for conflict markers in your files, CVS Conflict Editor does it for you. You can edit your file to solve the conflicts in place,