124 lines
2.9 KiB
HTML
124 lines
2.9 KiB
HTML
<HTML>
|
|
<HEAD>
|
|
<TITLE>diff(1)</TITLE>
|
|
</HEAD>
|
|
<BODY>
|
|
<H1>diff(1)</H1>
|
|
<HR>
|
|
<PRE>
|
|
|
|
</PRE>
|
|
<H2>NAME</H2><PRE>
|
|
diff - print differences between two files
|
|
|
|
|
|
</PRE>
|
|
<H2>SYNOPSIS</H2><PRE>
|
|
<STRONG>diff</STRONG> [<STRONG>-c</STRONG> | <STRONG>-e</STRONG> | <STRONG>-C</STRONG> <EM>n</EM>] [<STRONG>-br</STRONG>]<EM>file1</EM> <EM>file2</EM>
|
|
|
|
|
|
</PRE>
|
|
<H2>OPTIONS</H2><PRE>
|
|
|
|
<STRONG>-C</STRONG> <EM>n</EM> Produce output that contains <EM>n</EM> lines of context
|
|
|
|
<STRONG>-b</STRONG> Ignore white space when comparing
|
|
|
|
<STRONG>-c</STRONG> Produce output that contains three lines of context
|
|
|
|
<STRONG>-e</STRONG> Produce an <EM>ed</EM>-script to convert <EM>file1</EM> into <EM>file2</EM>
|
|
|
|
<STRONG>-r</STRONG> Apply <EM>diff</EM> recursively to files and directories of
|
|
|
|
|
|
</PRE>
|
|
<H2>EXAMPLES</H2><PRE>
|
|
|
|
<STRONG>diff</STRONG> <STRONG>file1</STRONG> <STRONG>file2</STRONG> # Print differences between 2 files
|
|
|
|
<STRONG>diff</STRONG> <STRONG>-C</STRONG> <STRONG>0</STRONG> <STRONG>file1</STRONG> <STRONG>file2</STRONG>
|
|
# Same as above
|
|
|
|
<STRONG>diff</STRONG> <STRONG>-C</STRONG> <STRONG>3</STRONG> <STRONG>file1</STRONG> <STRONG>file2</STRONG>
|
|
# Output three lines of context with every
|
|
|
|
<STRONG>diff</STRONG> <STRONG>-c</STRONG> <STRONG>file1</STRONG> <STRONG>file2</STRONG> # Same
|
|
|
|
<STRONG>diff</STRONG> <STRONG>/etc</STRONG> <STRONG>/dev</STRONG> # Compares recursively the directories /<EM>etc</EM> and /<EM>dev</EM>
|
|
|
|
<STRONG>diff</STRONG> <STRONG>passwd</STRONG> <STRONG>/etc</STRONG> # Compares ./<EM>passwd</EM> to /<EM>etc</EM>/<EM>passwd</EM>
|
|
|
|
|
|
</PRE>
|
|
<H2>DESCRIPTION</H2><PRE>
|
|
the same name, when <EM>file1</EM> and <EM>file2</EM> are both directories" difference
|
|
encountered"
|
|
|
|
<EM>Diff</EM> compares two files and generates a list of lines telling how the two
|
|
files differ. Lines may not be longer than 128 characters. If the two
|
|
arguments on the command line are both directories, <EM>diff</EM> recursively
|
|
steps through all subdirectories comparing files of the same name. If a
|
|
file name is found only in one directory, a diagnostic message is written
|
|
to <EM>stdout</EM>. A file that is of either block special, character special or
|
|
FIFO special type, cannot be compared to any other file. On the other
|
|
hand, if there is one directory and one file given on the command line,
|
|
<EM>diff</EM> tries to compare the file with the same name as <EM>file</EM> in the
|
|
directory <EM>directory</EM>.
|
|
|
|
|
|
|
|
</PRE>
|
|
<H2>SEE ALSO</H2><PRE>
|
|
<STRONG><A HREF="../man1/cdiff.1.html">cdiff(1)</A></STRONG>, <STRONG><A HREF="../man1/cmp.1.html">cmp(1)</A></STRONG>, <STRONG><A HREF="../man1/comm.1.html">comm(1)</A></STRONG>, <STRONG><A HREF="../man1/patch.1.html">patch(1)</A></STRONG>.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</PRE>
|
|
</BODY>
|
|
</HTML>
|