.TH TKDIFF 1 "1995/06/16 12:52:15"

.SH NAME 
tkdiff \- A graphical "diff" utility.

.SH SYNOPSIS 
.B tkdiff
to interactively pick files.

.B tkdiff <file1> <file2>
to compare two files.

.B tkdiff -conflict <file>
to merge a file with conflict markers generated by "merge" or "cvs", The
file is split into two temporary files which you can then merge as usual.

.B tkdiff <file>
to compare <file> with the most recent version checked into CVS/SCCS/RCS
(checked for in that order).

.B tkdiff -r <file>
to compare <file> with the most recent version checked in.

.B tkdiff -r<rev> <file>
to compare <file> with revision <rev> of <file>.

.B tkdiff -r<rev> -r <file>
to compare revision <rev> of <file> with the most recent version
checked in.

.B tkdiff -r<rev1> -r<rev2> <file>
to compare revisions <rev1> and <rev2> of <file>.

.SH DESCRIPTION
A graphical "diff" utility.  Online help is available by hitting
the "help" button.

.SH AUTHOR
John Klassa <klassa@ipass.net>
Warren Jones, Peter Brandstrom.