sdiff(1) [hpux man page]

sdiff(1)						      General Commands Manual							  sdiff(1)

NAME

       sdiff - side-by-side difference program

SYNOPSIS

       [options ...] file1 file2

DESCRIPTION

       uses the output of diff(1) with the option, which ignores trailing blanks (spaces and tabs) and treats other strings of blanks as equal, to
       produce a side-by-side listing of two files, indicating those lines that are different.	Each line of the two files is printed with a blank
       gutter  between	them if the lines are identical, a in the gutter if the line only exists in file1, a in the gutter if the line only exists
       in file2, and a for lines that are different.

       For example:

								      abc   |	xyz
								      abc	abc
								      bca   <
								      cba   <
								      dcb	dcb
									    >	cde

   Options
       recognizes the following options:

	      Use the next argument,
			  n, as the width of the output line. The maximum value of n is 2048 (LINE_MAX).  The default line length is  130  charac-
			  ters.

	      Only print on the left side when lines are identical.

	      Do not print identical lines.

	      Use the next argument,
			  output, as the name of a third file that is created as a user-controlled merging of file1 and file2.	Identical lines of
			  file1 and file2 are copied to output.  Sets of differences, as produced by diff(1), are printed; where a set of  differ-
			  ences  share	a  common gutter character.  After printing each set of differences, prompts the user with a and waits for
			  one of the following user-typed commands:

			       append the left column to the output file

			       append the right column to the output file

			       turn on silent mode; do not print identical lines

			       turn off silent mode

			       call the editor with the left column

			       call the editor with the right column

			       call the editor with the concatenation of left and right

			       call the editor with a zero length file

			       exit from the program

			  On exit from the editor, the resulting file is concatenated on the end of the output file.

EXAMPLES

       Print a side-by-side diff of two versions of a file on a printer capable of printing 132 columns:

       Retrieve the most recently checked in version of a file from RCS and compare it with the version currently checked out:

SEE ALSO

       diff(1), ed(1).

																	  sdiff(1)

DIFF(1) 						      General Commands Manual							   DIFF(1)

NAME

       diff - differential file comparator

SYNOPSIS

       diff [ -efbwr ] file1 ... file2

DESCRIPTION

       Diff tells what lines must be changed in two files to bring them into agreement.  If one file is a directory, then a file in that directory
       with basename the same as that of the other file is used.  If both files are directories, similarly named files in the two directories  are
       compared  by the method of diff for text files and cmp(1) otherwise.  If more than two file names are given, then each argument is compared
       to the last argument as above.  The -r option causes diff to process similarly named subdirectories recursively.  The  normal  output  con-
       tains lines of these forms:

	    n1 a n3,n4
	    n1,n2 d n3
	    n1,n2 c n3,n4

       These  lines resemble ed commands to convert file1 into file2.  The numbers after the letters pertain to file2.	In fact, by exchanging `a'
       for `d' and reading backward one may ascertain equally how to convert file2 into file1.	As in ed, identical pairs where n1 = n2 or n3 = n4
       are abbreviated as a single number.

       Following  each	of these lines come all the lines that are affected in the first file flagged by `<', then all the lines that are affected
       in the second file flagged by `>'.

       The -b option causes trailing blanks (spaces and tabs) to be ignored and other strings of blanks to compare equal.  The	-w  option  causes
       all white-space to be removed from input lines before applying the difference algorithm.

       The  -e	option produces a script of a, c and d commands for the editor ed, which will recreate file2 from file1.  The -f option produces a
       similar script, not useful with ed, in the opposite order. It may, however, be useful as input to a stream-oriented post-processor.

       Except in rare circumstances, diff finds a smallest sufficient set of file differences.

FILES

       /tmp/diff[12]

SOURCE

       /sys/src/cmd/diff

SEE ALSO

       cmp(1), ed(1)

DIAGNOSTICS

       Exit status is the empty string for no differences, for some, and for trouble.

BUGS

       Editing scripts produced under the -e or -f option are naive about creating lines consisting of a single `.'.
       When running diff on directories, the notion of what is a text file is open to debate.

																	   DIFF(1)