tkdiff(1) [linux 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 - compareRCS revisions

SYNOPSIS

       rev1] rev2] file ...

DESCRIPTION

       compares two revisions of each given RCS file and creates output very similar to (see diff(1)).	A file name ending in is an RCS file name,
       otherwise it is a working file name.  derives the working file name from the RCS file name and vice versa,  as  explained  in  rcsintro(5).
       Pairs consisting of both an RCS and a working file name can also be specified.

       recognizes the following options:

	      Same as described in
		    diff(1);

	      Same as described in
		    diff(1);

	      Same as described in
		    diff(1);

	      Same as described in
		    diff(1);

	      Generate an edit script of the format used by
		    RCS.

	      Generate a diff with lines of context.
		    The default is to present 3 lines of context.  To change, specify n; for example, gives 10 lines of context.

		    modifies  the output format slightly from the normal diff(1) output.  The ``context'' output begins with identification of the
		    files involved and their creation dates, then each change is separated by a line with a dozen (asterisks).	Lines removed from
		    file1  are	marked	with  (dashes); those added to file2 with (pluses).  Lines that are changed from one file to the other are
		    marked in both files with (exclamation marks).

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

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

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

       Both rev1 and rev2 can be given numerically or symbolically.

EXAMPLES

       Compare the latest trunk revision of RCS file and the contents of working file

       Compare the revisions 1.1 and 1.2 in the RCS file

AUTHOR

       was developed by Walter F. Tichy.

SEE ALSO

       ci(1), co(1), diff(1), ident(1), rcs(1), rcsmerge(1), rlog(1), rcsfile(4), rcsintro(5).

																	rcsdiff(1)