Add support for CVS conflict editor
Status: Alpha
Brought to you by:
tbleier
Add support for CVS conflict
editor
http://sourceforge.net/projects/conflicteditor/
http://gaiacrtn.free.fr/cce/