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)
Check Out this Related Man Page
rcsdiff(1)rcsdiff(1)NAME
rcsdiff - compare RCS revisions
SYNOPSIS
rcsdiff [-ksubst] [-q] [-rrev1 [-rrev2]] [-Vn] [-xsuffixes] [diff options] file...
DESCRIPTION
rcsdiff runs diff(1) to compare two revisions of each RCS file given.
Pathnames matching an RCS suffix denote RCS files; all others denote working files. Names are paired as explained in ci(1).
The option -q suppresses diagnostic output. Zero, one, or two revisions may be specified with -r. The option -ksubst affects keyword sub-
stitution when extracting revisions, as described in co(1); for example, -kk -r1.1 -r1.2 ignores differences in keyword values when compar-
ing revisions 1.1 and 1.2. To avoid excess output from locker name substitution, -kkvl is assumed if (1) at most one revision option is
given, (2) no -k option is given, (3) -kkv is the default keyword substitution, and (4) the working file's mode would be produced by co -l.
See co(1) for details about -V and -x. Otherwise, all options of diff(1) that apply to regular files are accepted, with the same meaning
as for diff.
If both rev1 and rev2 are omitted, rcsdiff compares the latest revision on the default branch (by default 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
compares the latest revision on the default branch of the RCS file to the contents of the working file f.c.
ENVIRONMENT
options prepended to the argument list, separated by spaces. See ci(1) for details.
DIAGNOSTICS
Exit status is 0 for no differences during any comparison, 1 for some differences, 2 for trouble.
IDENTIFICATION
Author: Walter F. Tichy.
Revision Number: 1.1.6.2; Release Date: 1993/10/07.
Copyright (C) 1982, 1988, 1989 by Walter F. Tichy.
Copyright (C) 1990, 1991 by Paul Eggert.
SEE ALSO ci(1), co(1), diff(1), ident(1), rcs(1), rcsintro(1), rcsmerge(1), rlog(1)
Walter F. Tichy, RCS--A System for Version Control, Software--Practice & Experience 15, 7 (July 1985), 637-654.
rcsdiff(1)