Return to rdiff3.ms CVS log

Up to [CSRG BSD Unix] / 43BSD / contrib / rcs / doc

Annotation of 43BSD/contrib/rcs/doc/rdiff3.ms, revision 1.1.1.1

1.1       root        1: .TL
                      2: Changes to diff3
                      3: .PP
                      4: .DS
                      5: diff3 [-ex3EX] file1 file2 file3 [m1 m2]
                      6: .DE
                      7: I added 2 new options, -E and -X. They work like -e and -x, respectively,
                      8: in that they generate an edit script that incorporate into file1
                      9: changes between file2 and file3. However, the scripts generated by -E and
                     10: -X treat overlapping changes (those marked ==== by normal diff3)
                     11: differently.
                     12: .PP
                     13: If applied to file1, the scripts generated by -E and -X include, for every
                     14: pair of overlapping changes, BOTH sections of lines,
                     15: delimited with "<<<<<<<\ m1", 
                     16: "=======", and ">>>>>>>\ m2". M1 and m2 are markers supplied in the 
                     17: command. If they are omitted, file1 and file3 are used instead. 
                     18: .PP
                     19: Example: Suppose lines 7-8 are changed in both file1 and file2.
                     20: Applying the edit script generated by the command
                     21: .DS
                     22: "diff3 -E file1 file2 file3" 
                     23: .DE
                     24: to file 1 results in the following file:
                     25: .nf
                     26: 
                     27: lines 1-6
                     28: of file1
                     29: <<<<<<< file1
                     30: lines 7-8
                     31: of file1
                     32: =======
                     33: lines 7-8
                     34: of file3
                     35: >>>>>>> file3
                     36: rest of file1
                     37: .PP
                     38: The command
                     39: .DS
                     40: merge file1 file2 file3 [m1 m2]
                     41: .DE
                     42: performs a diff -E with the same arguments and applies the resulting edit 
                     43: script to file1. It also prints out the number of overlapping changes. 

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