Return to diff CVS log

Up to [MW Coherent from dump] / coherent / a / usr / man / MULTI

Annotation of coherent/a/usr/man/MULTI/diff, revision 1.1

1.1     ! root        1: 
        !             2: 
        !             3: diff                         Command                         diff
        !             4: 
        !             5: 
        !             6: 
        !             7: 
        !             8: Summarize differences between two files
        !             9: 
        !            10: ddiiffff [-bbddeeffhh] [-cc _s_y_m_b_o_l] _f_i_l_e_1 _f_i_l_e_2
        !            11: 
        !            12: diff compares file1 with file2, and prints a summary of the chan-
        !            13: ges needed to turn file1 into file2.
        !            14: 
        !            15: Two options  involve input file specification.   First, the stan-
        !            16: dard input  may be  specified in  place of a  file by  entering a
        !            17: hyphen `-'  in place of  file1 or file2.   Second, if file1  is a
        !            18: directory, diff  looks within that directory for  a file that has
        !            19: the same name as  file2, then compares file2 with the file of the
        !            20: same name in directory file1.
        !            21: 
        !            22: The default output script has lines in the following format:
        !            23: 
        !            24: 
        !            25:         1,2 c 3,4
        !            26: 
        !            27: 
        !            28: The numbers 1,2 refer to line  ranges in file1, and 3,4 to ranges
        !            29: in file2.   The range  is abbreviated to  a single number  if the
        !            30: first number is the same as the second.  The command c was chosen
        !            31: from among  the ed commands `aa', `cc', and  `dd'.  diff then prints
        !            32: the text from each of  the two files.  Text associated with file1
        !            33: is  preceded  by  `< ', whereas  text  associated  with file2  is
        !            34: preceded by `>'.
        !            35: 
        !            36: The following summarizes diff's options.
        !            37: 
        !            38: -bb Ignore trailing blanks and treat more than one blank in an in-
        !            39:    put line as a single blank.  Spaces and tabs are considered to
        !            40:    be blanks for this comparison.
        !            41: 
        !            42: -cc _s_y_m_b_o_l
        !            43:    Produce output suitable for the C preprocessor cpp; the output
        !            44:    contains #iiffddeeff, #iiffnnddeeff, #eellssee,  and #eennddiiff lines.  symbol is
        !            45:    the string used to build the #ifdef statements.  If you define
        !            46:    symbol to the C preprocessor cpp, it will produce file2 as its
        !            47:    output; otherwise,  it will  produce file1.  This  option does
        !            48:    _n_o_t  work  for files  that  already  contain #iiffddeeff,  #iiffnnddeeff,
        !            49:    #eellssee, and #eennddiiff statements.
        !            50: 
        !            51: -ee Create an ed script that will convert file1 into file2.
        !            52: 
        !            53: -ff Produce a script in the same manner as the -e option, but with
        !            54:    line numbers  taken directly from  the two input  files.  This
        !            55:    will work  properly only if applied from  end to beginning; it
        !            56:    cannot be used directly by ed.
        !            57: 
        !            58: -hh Compare large files that have a minimal number of differences.
        !            59:    This  option uses  an algorithm  that is  not limited  by file
        !            60:    length, but may not discover all differences.
        !            61: 
        !            62: 
        !            63: 
        !            64: COHERENT Lexicon                                           Page 1
        !            65: 
        !            66: 
        !            67: 
        !            68: 
        !            69: diff                         Command                         diff
        !            70: 
        !            71: 
        !            72: 
        !            73: -dd  Select the  -h algorithm  only for  files larger  than 25,000
        !            74:    bytes; otherwise, use the normal algorithm.
        !            75: 
        !            76: ***** See Also *****
        !            77: 
        !            78: ed, egrep, commands
        !            79: 
        !            80: ***** Diagnostics *****
        !            81: 
        !            82: diff's exit status is zero when the files are identical, one when
        !            83: they are  different, and two if a  problem was encountered (e.g.,
        !            84: could not open a file).
        !            85: 
        !            86: ***** Notes *****
        !            87: 
        !            88: diff cannot  handle files with  more than 32,000  lines.  Handing
        !            89: diff a file  that exceeds that limit will cause  it to fail, with
        !            90: unpredictable side effects.
        !            91: 
        !            92: 
        !            93: 
        !            94: 
        !            95: 
        !            96: 
        !            97: 
        !            98: 
        !            99: 
        !           100: 
        !           101: 
        !           102: 
        !           103: 
        !           104: 
        !           105: 
        !           106: 
        !           107: 
        !           108: 
        !           109: 
        !           110: 
        !           111: 
        !           112: 
        !           113: 
        !           114: 
        !           115: 
        !           116: 
        !           117: 
        !           118: 
        !           119: 
        !           120: 
        !           121: 
        !           122: 
        !           123: 
        !           124: 
        !           125: 
        !           126: 
        !           127: 
        !           128: 
        !           129: 
        !           130: COHERENT Lexicon                                           Page 2
        !           131: 
        !           132: 

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