tkdiff(1) [debian man page]

TKDIFF(1)						      General Commands Manual							 TKDIFF(1)

NAME

       tkdiff - A graphical "diff" utility.

SYNOPSIS

       tkdiff to interactively pick files.

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

       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.

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

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

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

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

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

DESCRIPTION

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

AUTHOR

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

								1995/06/16 12:52:15							 TKDIFF(1)

RCSDIFF(1)						      General Commands Manual							RCSDIFF(1)

NAME

       rcsdiff - compare RCS revisions

SYNOPSIS

       rcsdiff [ -biwt ] [ -cefhn ] [ -rrev1 ] [ -rrev2 ] file ...

DESCRIPTION

       Rcsdiff runs diff (1) to compare two revisions of each RCS file given.  A file name ending in ',v' is an RCS file name, otherwise a working
       file name. Rcsdiff derives the working file name from the RCS file name and vice versa, as explained in co (1). Pairs consisting of both an
       RCS and a working file name may also be specified.

       All options except -r have the same effect as described in diff(1).

       If  both  rev1 and rev2 are omitted, rcsdiff compares the latest revision on the trunk with the contents of the corresponding working file.
       This is useful for determining what you changed since the last checkin.

       If rev1 is given, but rev2 is omitted, rcsdiff compares revision rev1 of the RCS file with the contents of the corresponding working file.

       If both rev1 and rev2 are given, rcsdiff compares revisions rev1 and rev2 of the RCS file.

       Both rev1 and rev2 may be given numerically or symbolically.

EXAMPLES

       The command

	       rcsdiff	f.c

       runs diff on the latest trunk revision of RCS file f.c,v and the contents of working file f.c.

IDENTIFICATION

       Author: Walter F. Tichy, Purdue University, West Lafayette, IN, 47907.
       Revision Number: 1.2 ; Release Date: 86/05/19 .
       Copyright (C) 1982 by Walter F. Tichy.

SEE ALSO

       ci (1), co (1), diff (1), ident (1), rcs (1), rcsintro (1), rcsmerge (1), rlog (1), rcsfile (5).
       Walter F. Tichy, "Design, Implementation, and Evaluation of a Revision Control System," in Proceedings of the 6th International	Conference
       on Software Engineering, IEEE, Tokyo, Sept. 1982.

BUGS

Purdue University						      5/19/86								RCSDIFF(1)