Museum

Home

Lab Overview

Retrotechnology Articles

⇒ Online Manual

Media Vault

Software Library

Restoration Projects

Artifacts Sought

Related Articles

diff(C)


     DIFF3(C)                             UNIX System V



     Name
          diff3 - compares three files


     Syntax
          diff3 [ -ex3 ] file1 file2 file3


     Description
          diff3 compares three  versions  of  a  file,  and  publishes
          disagreeing ranges of text flagged with these codes:

               ====            All three files differ

               ====1           File1 is different

               ====2           File2 is different

               ====3           File3 is different

          The type of change suffered in converting a given range of a
          given  file to some other range is indicated in one of these
          ways:

               f : n1 a        Text  is  to  be  appended  after  line
                               number n1 in file f, where f = 1, 2, or
                               3.

               f : n1 , n2 c   Text is to be changed in the range line
                               n1  to  line n2.  If n1 = n2, the range
                               may be abbreviated to n1.

          The original contents of the range follows immediately after
          a  c  indication.   When  the  contents  of  two  files  are
          identical,  the  contents  of  the  lower-numbered  file  is
          suppressed.

          Under the -e option, diff3 publishes a script for the editor
          ed  that  will  incorporate  into  file1 all changes between
          file2 and file3, i.e., the changes that  normally  would  be
          flagged  ==== and ====3.  The -x option produces a script to
          incorporate changes flagged with ``====''.   Similarly,  the
          -3  option  produces a script to incorporate changes flagged
          with ``====3''.  The following command applies  a  resulting
          editing script to file1:

               (cat script; echo '1,$p') | ed - file1


     Files
          /tmp/d3*

          /usr/lib/diff3prog


     See Also
          diff(C)


     Notes
          The -e option does not work properly for lines consisting of
          a single period.

          The input file size limit is 64K bytes.


     (printed 2/15/90)                                   DIFF3(C)















































































































































































































































































































































































































































































































































Typewritten Software • bear@typewritten.org • Edmonds, WA 98026