JDiff X

JDiff X is a document comparison plug-in for Jedit X. It displays the changes made in Jedit X documents.

You can compare any types of documents that can be read with Jedit X, including plain text of various text encodings or rich text documents. You can also merge the differences instantly using its merge button or the contextual menu.