https://gunkies.org/index.php?action=history&feed=atom&title=32v_1m_diff 2026-05-11T23:47:51Z Revision history for this page on the wiki MediaWiki 1.30.1 https://gunkies.org/w/index.php?title=32v_1m_diff&diff=6955&oldid=prev 2009-10-26T13:50:36Z

<p>New page: DIFF(1) UNIX Programmer&#039;s Manual DIFF(1) == NAME == diff - differential file comparator == SYNOPSIS == diff [ -efbh ] file1 file2 == DESCRIPTION ==...</p> <p><b>New page</b></p><div>DIFF(1) UNIX Programmer's Manual DIFF(1)<br /> <br /> <br /> <br /> == NAME == <br /> diff - differential file comparator<br /> <br /> == SYNOPSIS ==<br /> diff [ -efbh ] file1 file2<br /> <br /> == DESCRIPTION ==<br /> _D_i_f_f tells what lines must be changed in two files to bring<br /> them into agreement. If _f_i_l_e_1 (_f_i_l_e_2) is `-', the standard<br /> input is used. If _f_i_l_e_1 (_f_i_l_e_2) is a directory, then a file<br /> in that directory whose file-name is the same as the file-<br /> name of _f_i_l_e_2 (_f_i_l_e_1) is used. The normal output contains<br /> lines of these forms:<br /> <br /> _n_1 a _n_3,_n_4<br /> _n_1,_n_2 d _n_3<br /> _n_1,_n_2 c _n_3,_n_4<br /> <br /> These lines resemble _e_d commands to convert _f_i_l_e_1 into<br /> _f_i_l_e_2. The numbers after the letters pertain to _f_i_l_e_2. In<br /> fact, by exchanging `a' for `d' and reading backward one may<br /> ascertain equally how to convert _f_i_l_e_2 into _f_i_l_e_1. As in<br /> _e_d, identical pairs where _n_1 = _n_2 or _n_3 = _n_4 are abbreviated<br /> as a single number.<br /> <br /> Following each of these lines come all the lines that are<br /> affected in the first file flagged by `&lt;', then all the<br /> lines that are affected in the second file flagged by `&gt;'.<br /> <br /> The -b option causes trailing blanks (spaces and tabs) to be<br /> ignored and other strings of blanks to compare equal.<br /> <br /> The -e option produces a script of _a, _c and _d commands for<br /> the editor _e_d, which will recreate _f_i_l_e_2 from _f_i_l_e_1. The -f<br /> option produces a similar script, not useful with _e_d, in the<br /> opposite order. In connection with -e, the following shell<br /> program may help maintain multiple versions of a file. Only<br /> an ancestral file ($1) and a chain of version-to-version _e_d<br /> scripts ($2,$3,...) made by _d_i_f_f need be on hand. A `latest<br /> version' appears on the standard output.<br /> <br /> (shift; cat $*; echo '1,$p') | ed - $1<br /> <br /> Except in rare circumstances, _d_i_f_f finds a smallest suffi-<br /> cient set of file differences.<br /> <br /> Option -h does a fast, half-hearted job. It works only when<br /> changed stretches are short and well separated, but does<br /> work on files of unlimited length. Options -e and -f are<br /> unavailable with -h.<br /> <br /> == FILES ==<br /> /tmp/d?????<br /> /usr/lib/diffh for -h<br /> <br /> == SEE ALSO ==<br /> [[32v 1m cmp|cmp(1)]], [[32v 1m comm|comm(1)]], [[32v 1m ed|ed(1)]]<br /> <br /> == DIAGNOSTICS ==<br /> Exit status is 0 for no differences, 1 for some, 2 for trou-<br /> ble.<br /> <br /> == BUGS ==<br /> Editing scripts produced under the -e or -f option are naive<br /> about creating lines consisting of a single `.'.<br /> <br /> [[Category:32v man section 1]]</div>

Neozeed