tkdiff

tkdiff program is a merge tool and a graphical diff that runs under Unix, Mac OSX and Windows.

It provides a side-by-side view of the differences between two files, along with several innovative features such as diff bookmarks and a graphical map of differences for quick navigation.

The diff program was developed in the early 1970s on the Unix operating system which was emerging from AT&T Bell Labs in Murray Hill, New Jersey. The final version, first shipped with the 5th Edition of Unix in 1974, was entirely written by Douglas McIlroy. This research was published in a 1976 paper co-written with James W. Hunt who developed an initial prototype of diff.

McIlroy's work was preceded and influenced by Steve Johnson's comparison program on GECOS and Mike Lesk's proof program. Proof originated on Unix and produced line-by-line changes like diff and even used angle-brackets (">" and "

What is new in this release:

• Support for Subversion, Bitkeeper, and PVCS was updated, and rudimentary support for Git was added.
• The file browser dialog has a sense of location now, and looks for the second file in the same directory as the first.
• The Mac OS application will run on Lion.