TkDiff is an application that was designed to acts as a graphical front-end to the diff program.
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.
TkDiff detects and supports RCS, CVS, Subversion and SCCS by looking for a directory with the same name.
It detects and supports PVCS by looking for a vcs.cfg file. It detects and supports AccuRev, Perforce and ClearCase by looking for the environment variables named ACCUREV_BIN, P4CLIENT, and CLEARCASE_ROOT respectively.
In the first form, tkdiff will present a dialog to allow you to choose the files to diff interactively.
In the second form, at least one of the arguments must be the name of a plain text file. Symbolic links are acceptable, but at least one of the filename arguments must point to a real file rather than to a directory.
In the remaining forms, REV (or REV1 and REV2) must be a valid revision number for FILE. Where AccuRev, RCS, CVS, Subversion, SCCS, PVCS or Perforce is implied but no revision number is specified, FILE is compared with the the revision most recently checked in.
To merge a file with conflict markers generated by "merge", "cvs", or "vmrg", use "tkdiff -conflict FILE". The file is split into two temporary files which you can merge as usual.
What's New in This Release: [ read full changelog ]
· Works with Subversion 1.7
· Make opening file dialog know where it started from, and start in the same directory as the first file when looking for the second one.
· You can now specify a preference for filetypes for the file open/save dialogs.
· Detect PVCS by environment variable
· Update BitKeeper support
· Mercurial support
· Rudimentary Git support
· Added help menu items to report versions of wish and diff
· Gave it a debug (-d) option