Return to diff3 CVS log

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

Annotation of coherent/a/usr/man/COHERENT/diff3, revision 1.1.1.1

1.1       root        1: 
                      2: 
                      3: diff3                        Command                        diff3
                      4: 
                      5: 
                      6: 
                      7: 
                      8: Summarize differences among three files
                      9: 
                     10: ddiiffff33 [-eexx33] _f_i_l_e_1 _f_i_l_e_2 _f_i_l_e_3
                     11: 
                     12: diff3 summarizes  the differences  among three text  files.  Each
                     13: difference  encountered  is   headed  by  one  of  the  following
                     14: separators, which  categorizes how many of  the three input files
                     15: differ in a given range.  The headers are as follows
                     16: 
                     17: ====
                     18:      All of the files are different.
                     19: 
                     20: ====_n
                     21:      Only the nth file differs, where n may be 1, 2, or 3.
                     22: 
                     23: For each set of changes marked as above, the actual change is in-
                     24: dicated for each file using a notation similar to commands to ed.
                     25: For each filen the following is printed:
                     26: 
                     27: _n: _laa
                     28:      Text is to be appended after line l in filen.
                     29: 
                     30: _n: _l,_mcc
                     31:      The text from  line l to line m is  to be changed for filen.
                     32:      The  original text  from filen follows  this line.   If this
                     33:      text  is identical  for two  of the  files, only  the latter
                     34:      (higher numbered) of the two is printed.
                     35: 
                     36: Options are available to print  a script of commands to ed.  With
                     37: the -e option, a script  that will make all changes between file2
                     38: and file3  to file1 is  produced.  This script is  based upon all
                     39: changes  flagged  with ====  or  ====3  separators, as  described
                     40: above.
                     41: 
                     42: The -x  option prints  only those  changes where all  three files
                     43: differ, i.e., those flagged with ====.
                     44: 
                     45: The -3 option requests only those changes where file3 differs.
                     46: 
                     47: ***** Example *****
                     48: 
                     49: The following  command sequence produces a  script, applies it to
                     50: file1, and sends the result to the standard output.
                     51: 
                     52: 
                     53:         (diff3 -e file1 file2 file3; echo '1,$p') | ed - file1
                     54: 
                     55: 
                     56: ***** Files *****
                     57: 
                     58: /tmp/d3*
                     59: /usr/lib/diff3
                     60: 
                     61: 
                     62: 
                     63: 
                     64: COHERENT Lexicon                                           Page 1
                     65: 
                     66: 
                     67: 
                     68: 
                     69: diff3                        Command                        diff3
                     70: 
                     71: 
                     72: 
                     73: ***** See Also *****
                     74: 
                     75: commands, diff, ed
                     76: 
                     77: ***** Diagnostics *****
                     78: 
                     79: An exit status of  zero indicates all three files were identical,
                     80: one indicates differences, and two indicates some other failure.
                     81: 
                     82: 
                     83: 
                     84: 
                     85: 
                     86: 
                     87: 
                     88: 
                     89: 
                     90: 
                     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.