Return to diff3.1 CVS log

Up to [Power 6/32 Unix Tahoe 4.2BSD] / cci / usr / src / man / man1

Annotation of cci/usr/src/man/man1/diff3.1, revision 1.1

1.1     ! root        1: .TH DIFF3 1  "18 January 1983"
        !             2: .SH NAME
        !             3: diff3 \- 3-way differential file comparison
        !             4: .SH SYNOPSIS
        !             5: .B diff3
        !             6: [
        !             7: .B \-ex3
        !             8: ]
        !             9: file1 file2 file3
        !            10: .SH DESCRIPTION
        !            11: .I Diff3
        !            12: compares three versions of a file,
        !            13: and publishes disagreeing ranges of text
        !            14: flagged with these codes:
        !            15: .TP 16
        !            16: ====
        !            17: all three files differ
        !            18: .TP 16
        !            19: ====1
        !            20: .IR file1 " is different"
        !            21: .TP 16
        !            22: ====2
        !            23: .IR file2 " is different"
        !            24: .TP 16
        !            25: ====3
        !            26: .IR file3 " is different"
        !            27: .PP
        !            28: The type of change suffered in converting a given range
        !            29: of a given file to some other is
        !            30: indicated in one of these ways:
        !            31: .TP 16
        !            32: .IB f " : " n1 " a"
        !            33: Text is to be appended after line number
        !            34: .I n1
        !            35: in file
        !            36: .I f,
        !            37: where
        !            38: .I f
        !            39: = 1, 2, or 3.
        !            40: .TP 16
        !            41: .IB f " : " n1 " , " n2 " c"
        !            42: Text is to be
        !            43: changed in the range line
        !            44: .I n1
        !            45: to line
        !            46: .IR n2 .
        !            47: If 
        !            48: .I n1
        !            49: =
        !            50: .I n2,
        !            51: the range may be abbreviated to
        !            52: .IR n1 .
        !            53: .PP
        !            54: The original contents of the range follows immediately
        !            55: after a
        !            56: .B c
        !            57: indication.
        !            58: When the contents of two
        !            59: files are identical, the contents of the lower-numbered
        !            60: file is suppressed.
        !            61: .PP
        !            62: Under the
        !            63: .B \-e
        !            64: option,
        !            65: .I diff3
        !            66: publishes a script for the editor
        !            67: .I ed
        !            68: that will incorporate into
        !            69: .I file1
        !            70: all changes between
        !            71: .I file2
        !            72: and
        !            73: .I file3,
        !            74: .IR i.e .
        !            75: the changes that normally would be flagged ==== and ====3.
        !            76: Option
        !            77: .B \-x
        !            78: (\fB\-3\fR)
        !            79: produces a script to incorporate
        !            80: only changes flagged ==== (====3).
        !            81: The following command will apply the resulting script to
        !            82: `file1'.
        !            83: .PP
        !            84: .ti 16n
        !            85: (cat script; echo \'1,$p\') \(bv ed \- file1
        !            86: .SH FILES
        !            87: /tmp/d3?????
        !            88: .br
        !            89: /usr/lib/diff3
        !            90: .SH "SEE ALSO"
        !            91: diff(1)
        !            92: .SH BUGS
        !            93: Text lines that consist of a single `.' will
        !            94: defeat
        !            95: .B \-e.

This archive runs on limited infrastructure. Preserving old code on modern bandwidth. Automated agents are requested to crawl responsibly.