jEdit

jEdit ( http://www.jedit.org/) is a comprehensive IDE written in Java, with support for many languages and plugins.

With reference to CVSNT and merging, jEdit has a mode called "JDiff" ( http://plugins.jedit.org/plugins/?JDiffPlugin). It augments the editor's ability to display two files side-by-side with color to show the differences between the files. You can then edit the files to get the result you want.

jEdit and JDiff mode is good for merging when the final result you want is a composite of the two sources.

jEdit is free, and can be run anywhere there's a Java Runtime Environment. (At this time, it requires JDK 1.4). It's easy to run on both Windows and Unixes such as Linux.

CategoryTools