From Free Software Directory
Revision as of 07:43, 12 April 2011 by WikiSysop (talk | contribs)

(diff) ← Older revision | Approved revision (diff) | Latest revision (diff) | Newer revision → (diff)
Jump to: navigation, search


Conflict resolution tool for CVS

The Majentis CVS Conflict Editor is a conflict resolution tool for CVS based on the wxWindows platform. It displays the current file, the CVS file, and the end result of the conflict resolution.



Verified by

Verified on




Verified by

Janet Casey

Verified on

21 May 2004

Leaders and contributors

Gerald Brandt Maintainer

Resources and communication

AudienceResource typeURI
Bug Tracking,Developer,

Software prerequisites

Required to useCVS
Required to usewxWindows 2.4.2


Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the page “GNU Free Documentation License”.

The copyright and license notices on this page only apply to the text on this page. Any software or copyright-licenses or other similar notices described in this text has its own copyright notice and license, which can usually be found in the distribution or license text itself.