KDE File Difference/Merge tool

[Richard Dale]

I've been comparing the sources in the 'kwrite' subdirectory of KDevelop, with
the sources in the kwrite directory under kdeutils-1.1.2/kwrite. They have both
obviously started off from the same code base. There were some bug fixes and
enhancements which were in the KWrite code, but not in KDevelop and vica versa.
Situation normal - welcome to real world software development!.

So I took diff's of the source and worked through manually reconciling the best
bits from each of the pairs of source files. I can now double click on a word
in kwrite to select it (like you can in KDevlelop), and I've added some code to
implement the 'Delete On Input' option in KDevelop which was missing.

It would have been really handy to have a visual diff tool to do this (I like
'FileMerge.app' on Mac OS X Server for instance). I think it should be a
separate app, but maybe you could have a menu option in KDevelop called 'Import
and Merge' or similar (and also integrated with the KDevelop CVS interface).

Does anyone know if such an app already exists (or are there any plans to write
one)?

-- Richard