We are glad to announce you the free merge/compare tool which can be
considered as good replacement of CVS conflict editor tool which is shipped
with plug-ins installation. This tool is named PushOk PowerMerge and made
by PushOk Software under GNU GPL license. It is based on RTEXT editor
component.
PushOk PowerMerge tool provide better visualization, enhanced syntax
highlighting and instant refreshing of conflict markers after editing of
file and lot of other enhancements. PowerMerge also support 3-way compare
mode which might be helpful for conflict resolution.
Installation package of PowerMerge in addition to deploying of required
components allows to adjust registry to configure plug-ins to use
PowerMerge tool as diff and conflict resolution tool. Installation package
also contains original RTEXT editor and plug-ins can be configured to use
it as viewer/editor tool.
You might ask, why it is packaged as separate product and didn't included
into plug-in installation. The reason is that tool is Java based and
requires Java JRE (>=1.3) for work. This might appears as stopper for some
users, and that's why it is not included into main installation.

We hope that you'll enjoy our new tool,
PushOk Software Team