Archive for the ‘SVN’ Category
A few months ago I looked for a good compare/diff and merge utility, since I needed one with good XML support.
After I tested a few, I decided to use ‘kdiff’ – an open-source utility.
- It supports XML UTF-8 very well
- It is automatically integrated to ClearCase, SVN, CVS and some more CM systems (It automatically replaces the ClearCase ‘map’ file – a very nice feature!)
- It suppotrs 3-way and 2-way merging.
- It’s open source 🙂
I wouldn’t give good mark for its graphic design, but it does the work very well.
In fact, it works so well so I used it instead of the built-in ClearCase diff/merge utility and deployed it to all my developers.
Here you can find more details: http://kdiff3.sourceforge.net/