Russell McMahon wrote:

> WinMerge is an Open Source visual text file differencing and merging tool 
> for Win32 platforms. It is highly useful for determing what has changed 
> between project versions, and then merging changes between versions.
> 
>         http://winmerge.org/
> 
> Works well (I'm told)

Another interesting one is kdiff3 (also for Win platforms, but also for
others)

>From http://kdiff3.sourceforge.net/ :

KDiff3 is a program that

    * compares or merges two or three text input files or directories,
    * shows the differences line by line and character by character (!),
    * provides an automatic merge-facility and
    * an integrated editor for comfortable solving of merge-conflicts,
    * supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.),
    * and has an intuitive graphical user interface.
    * Read what else is special in a short abstract (PDF).

Supported platforms:

    * GNU/Linux with KDE3,
    * Any Un*x that is supported by the Qt-libs from Trolltech,
    * And even MS-Windows.
    * In theory any platform for which Qt-libs work.

Translations by the KDE-I18N-Team:

    * Interface: da, de, en_GB, es, et, fr, hu, it, nl, pl, pt_BR, pt, ru,
sr, sv, ta, tr, zh_CN
    * Documentation: da, et, it, sv

Gerhard
_______________________________________________
http://www.piclist.com PIC/SX FAQ & list archive
View/change your membership options at
http://mailman.mit.edu/mailman/listinfo/piclist