02.05.2013 Views

Description - Mks.com

Description - Mks.com

Description - Mks.com

SHOW MORE
SHOW LESS

Create successful ePaper yourself

Turn your PDF publications into a flip-book with our unique Google optimized e-Paper software.

each with a line number (or range) in path2. After the line giving the type of change, diff displays<br />

the deleted or added lines, prefixing lines from path1 with < and lines from path2 with >.<br />

When you call the <strong>com</strong>mand as diffh, it automatically uses the -h option.<br />

When you call it as bdiff, diff <strong>com</strong>putes the differences in chunks of n lines (default 3999). This<br />

lets you process arbitrarily large files and generally produces less output than the -h option.<br />

The vdiff32 <strong>com</strong>mand is a graphical version of diff, giving you the ability to <strong>com</strong>pare and view<br />

files from a graphical user interface. Complete instructions on using vdiff32 are available<br />

through its online help feature.<br />

Options<br />

-B<br />

-b<br />

-C n<br />

-c[n]<br />

uses diffb to <strong>com</strong>pare the files when binary files are detected.<br />

ignores white space at the end of each line (except the newline) and treats all consecutive<br />

strings of white space elsewhere in a line as equivalent (effectively, reducing all strings of<br />

white space to a single space for the purpose of <strong>com</strong>paring lines). For example if one file<br />

contained a string of three spaces and a tab at a given location while the other file contained<br />

a string of two spaces at the same location, diff would not report this as a difference.<br />

shows n lines of context before and after each change. diff marks lines removed from<br />

path1 with -, lines added to path2 with + and lines changed in both files with !. This option<br />

conflicts with the -e and -f options.<br />

is equivalent to -C n, but n is optional. The default value for n is 3. This option conflicts with<br />

the -e and -f options.<br />

-Difname<br />

displays output that is the appropriate input to the C preprocessor to generate the contents<br />

of path2 when ifname is defined, and the contents of path1 when ifname is not defined.<br />

-e<br />

-f<br />

writes out a script of <strong>com</strong>mands for the ed text editor that converts path1 to path2. diff<br />

sends the output to the standard output. This option conflicts with the -m, -c, and -C<br />

options.<br />

377 of 457

Hooray! Your file is uploaded and ready to be published.

Saved successfully!

Ooh no, something went wrong!