Bug tracker and mailing list can be found at the Project page

Eskil: A graphical frontend to Diff

About Eskil

The first major application I wrote in Tcl/Tk was this tool (somewhere around 1997). Writing it is what made me learn and enjoy Tcl. (I already liked Tk but still found Tcl annoying at the time.)
I have used it a lot during the years and lately it has received enough polish to grant a public release.

Pronunciation: The E is short, like in "set", the rest is like "skill".

Any feedback, good or bad, can be sent to <peter dot spjuth at space dot se>

It is similar but unrelated to TkDiff.

Features

Highlights changes within a line.
Matches similar lines within a changed block to better show changed lines that are adjacent to added/removed lines.
Directory diff.
CVS/RCS/ClearCase/GIT/SVN/BZR/HG diff. Conflict merge.
View patch file.
Print to PDF or postscript.
"Clip diff"
Plugins for preprocessing files.
Alignment and block diff functions for tricky diffs.
Edit and Save file from diff window.
Starkit browsing.

Download

Version 2.4:
Is available from the Project page both as a Starkit and as Starpacks for Windows, Linux and Solaris.

The license for the application source is GPL but the bundled packages are under the same license as Tcl.

More information about Starkits and Starpacks.

Screenshots

A "zoom" feature for long lines.

Changes

Changes in v2.4 (2009-01-08):

Completely redesigned directory diff.
Added a log viewer in revision mode.
Added color option for unchanged text.
Plugins support.
Support for Subversion, Mercurial and Bazaar.
Support commit in Subversion.
Added -review for displaying all changes in a tree.
Support command line "-" to read a patch from std input.

Changes in v2.3 (2007-12-05):

Added -printpdf command line option.
Fixed line numbering in PDF with big line numbers.
Started on GIT support.
Anything on the command line is checked for a starkit. Kits are mounted and treated as directories.

Changes in v2.2 (2007-04-05):

Added experimental -nonewline command option.
Added -close command option.
Added experimental PDF print.
Added dirdiff preferences and filters.
Smarter save in merge. [FR 2957]
Added commit button for CVS. [FR 2780]
Bug fixes include: Kits are mounted readonly, fixed dir diff window menu, improved patch file parsing.

Changes in v2.1 (2006-06-02):

Added -preprocess command line option.
Added -foreach command line option.
Added -context command line option.
Handle starkits as directories in dir diff.
Support relative -r with CVS.

Changes in v2.0.7 (2004-12-14):

Added regsub preprocessing option.
Added -prefix command line option.
Improved merge window.
Added ignore keyword option to directory diff.

Changes in v2.0.6 (2004-10-19):

Added Ignore Digit option.
Fixed bug in -r for ClearCase.
Edit Mode made more robust.

Changes in v2.0.5 (2004-08-20):

Option -r can now be used with ClearCase diff.
Edit Mode allows simple editing in the diff display and saving.

Changes in v2.0.4 (2004-06-17):

Added ignore case option.
Improved alignment function.

Changes in v2.0.3 (2004-05-26):

Added context options for "Diffs only" mode.
Rewrote how "Separate Diff" and "Align" works. The latter now only happens after a "Redo Diff".
Added scroll map and some more context menu options in Directory Diff.

Changes in v2.0.2 (2004-05-03):

Fixed a bug in ClearCase support.
Improved enscipt usage in print command.
Added "mark file" in dirdiff context menu.

Changes in v2.0.1 (2004-02-10):

Added preference for width and height.
Added Tools menu to directory diff window.
Made it simpler to save a conflict in the same file.

First public release v2.0 (2004-01-30):