https://gunkies.org/index.php?action=history&feed=atom&title=32v_1m_diff332v 1m diff3 - Revision history2026-06-04T11:13:01ZRevision history for this page on the wikiMediaWiki 1.30.1https://gunkies.org/w/index.php?title=32v_1m_diff3&diff=6956&oldid=prevNeozeed: New page: DIFF3(1) UNIX Programmer's Manual DIFF3(1) == NAME == diff3 - 3-way differential file comparison == SYNOPSIS == diff3 [ -ex3 ] file1 file2 file3 == DE...2009-10-26T13:52:02Z<p>New page: DIFF3(1) UNIX Programmer's Manual DIFF3(1) == NAME == diff3 - 3-way differential file comparison == SYNOPSIS == diff3 [ -ex3 ] file1 file2 file3 == DE...</p>
<p><b>New page</b></p><div>DIFF3(1) UNIX Programmer's Manual DIFF3(1)<br />
<br />
<br />
<br />
== NAME ==<br />
diff3 - 3-way differential file comparison<br />
<br />
== SYNOPSIS ==<br />
diff3 [ -ex3 ] file1 file2 file3<br />
<br />
== DESCRIPTION ==<br />
_D_i_f_f_3 compares three versions of a file, and publishes<br />
disagreeing ranges of text flagged with these codes:<br />
<br />
==== all three files differ<br />
<br />
====1 _f_i_l_e_1 is different<br />
<br />
====2 _f_i_l_e_2 is different<br />
<br />
====3 _f_i_l_e_3 is different<br />
<br />
The type of change suffered in converting a given range of a<br />
given file to some other is indicated in one of these ways:<br />
<br />
_f : _n_1 a Text is to be appended after line number _n_1<br />
in file _f, where _f = 1, 2, or 3.<br />
<br />
_f : _n_1 , _n_2 c Text is to be changed in the range line _n_1<br />
to line _n_2. If _n_1 = _n_2, the range may be<br />
abbreviated to _n_1.<br />
<br />
The original contents of the range follows immediately after<br />
a c indication. When the contents of two files are identi-<br />
cal, the contents of the lower-numbered file is suppressed.<br />
<br />
Under the -e option, _d_i_f_f_3 publishes a script for the editor<br />
_e_d that will incorporate into _f_i_l_e_1 all changes between<br />
_f_i_l_e_2 and _f_i_l_e_3, _i._e. the changes that normally would be<br />
flagged ==== and ====3. Option -x (-3) produces a script to<br />
incorporate only changes flagged ==== (====3). The follow-<br />
ing command will apply the resulting script to `file1'.<br />
<br />
(cat script; echo '1,$p') | ed - file1<br />
<br />
== FILES ==<br />
/tmp/d3?????<br />
/usr/lib/diff3<br />
<br />
== SEE ALSO ==<br />
[[32v 1m diff|diff(1)]]<br />
<br />
== BUGS ==<br />
Text lines that consist of a single `.' will defeat -e.<br />
<br />
<br />
[[Category:32v man section 1]]</div>Neozeed